From 1f55e72ebbbc2288025d430aa1e7a4ce0a5450ec Mon Sep 17 00:00:00 2001
From: Isaac Hirschfeld <wsl1@reheatedcake.io>
Date: Fri, 31 Dec 2021 10:47:46 -0600
Subject: [PATCH] Update egui to 1.16.1

---
 Cargo.toml       | 6 +++---
 src/egui_node.rs | 8 ++++----
 src/lib.rs       | 2 +-
 src/systems.rs   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7fe32a032..58d41a146 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,9 +21,9 @@ open_url = ["webbrowser"]
 [dependencies]
 bevy = { version = "0.5", default-features = false, features = [
     "render",
-    "bevy_winit"
+    "bevy_winit",
 ] }
-egui = "0.15.0"
+egui = "0.16.1"
 webbrowser = { version = "0.5.5", optional = true }
 winit = { version = "0.24.0", features = ["x11"], default-features = false }
 
@@ -38,5 +38,5 @@ version-sync = "0.9.2"
 bevy = { version = "0.5", default-features = false, features = [
     "bevy_wgpu",
     "x11",
-    "png"
+    "png",
 ] }
diff --git a/src/egui_node.rs b/src/egui_node.rs
index df349da4d..6454038bf 100644
--- a/src/egui_node.rs
+++ b/src/egui_node.rs
@@ -30,7 +30,7 @@ use bevy::{
     utils::HashMap,
     window::WindowId,
 };
-use egui::paint::ClippedShape;
+use egui::epaint::ClippedShape;
 use std::{borrow::Cow, collections::HashSet};
 
 pub struct EguiNode {
@@ -523,7 +523,7 @@ impl EguiNode {
             self.update_texture(render_resource_context, texture, texture_handle);
         }
 
-        let egui_texture = egui_context.ctx_for_window(self.window_id).texture();
+        let egui_texture = egui_context.ctx_for_window(self.window_id).font_image();
         if self.egui_texture_version != Some(egui_texture.version) {
             self.egui_texture_version = Some(egui_texture.version);
             if let Some(egui_texture_handle) = self.egui_texture.clone() {
@@ -561,7 +561,7 @@ impl EguiNode {
         texture_assets: &mut Assets<Texture>,
     ) {
         if self.egui_texture.is_none() {
-            let texture = egui_context.ctx_for_window(self.window_id).texture();
+            let texture = egui_context.ctx_for_window(self.window_id).font_image();
             self.egui_texture = Some(texture_assets.add(as_bevy_texture(&texture)));
             self.egui_texture_version = Some(texture.version);
 
@@ -769,7 +769,7 @@ fn find_bind_group_by_binding_name(
         .cloned()
 }
 
-fn as_bevy_texture(egui_texture: &egui::Texture) -> Texture {
+fn as_bevy_texture(egui_texture: &egui::FontImage) -> Texture {
     let mut pixels = Vec::new();
     pixels.reserve(4 * pixels.len());
     for &alpha in egui_texture.pixels.iter() {
diff --git a/src/lib.rs b/src/lib.rs
index fc7b91431..6a9faad4e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -212,7 +212,7 @@ pub struct EguiShapes {
     /// Pairs of rectangles and paint commands.
     ///
     /// The field gets populated during the [`EguiStage::UiFrameEnd`] stage and reset during `EguiNode::update`.
-    pub shapes: Vec<egui::paint::ClippedShape>,
+    pub shapes: Vec<egui::epaint::ClippedShape>,
 }
 
 /// Is used for storing Egui output. The actual resource is [`HashMap<WindowId, EguiOutput>`].
diff --git a/src/systems.rs b/src/systems.rs
index 56bd6c843..c274525a2 100644
--- a/src/systems.rs
+++ b/src/systems.rs
@@ -93,7 +93,7 @@ pub fn process_input(
         }
 
         for egui_input in input_resources.egui_input.values_mut() {
-            egui_input.raw_input.scroll_delta += delta;
+            egui_input.raw_input.events.push(egui::Event::Scroll(delta));
         }
     }