Merge pull request #8 from xNxExOx/main

Update egui to 0.26
zakarumych · Feb 7, 2024 · e5033ff · e5033ff
2 parents 7785916 + 50bed15
commit e5033ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,16 +13,16 @@ categories = ["gui", "visualization"]
 serde = ["dep:serde", "egui/serde", "slab/serde"]
 
 [dependencies]
-egui = { version = "0.25" }
+egui = { version = "0.26" }
 slab = { version = "0.4" }
 serde = { version = "1.0", features = ["derive"], optional = true }
 tiny-fn = { version = "0.1.6" }
 
-egui-probe = { version = "0.1", features = ["derive"], optional = true }
+egui-probe = { version = "0.2", features = ["derive"], optional = true }
 
 [dev-dependencies]
-eframe = { version = "0.25", features = ["serde", "persistence"] }
-egui_extras = { version = "0.25", features = ["all_loaders"] }
+eframe = { version = "0.26", features = ["serde", "persistence"] }
+egui_extras = { version = "0.26", features = ["all_loaders"] }
 syn = { version = "2.0", features = ["extra-traits"] }
 serde_json = { version = "1.0" }
 

diff --git a/demo/Cargo.toml b/demo/Cargo.toml
@@ -8,10 +8,10 @@ name = "demo"
 path = "../examples/demo.rs"
 
 [dependencies]
-egui = { version = "0.25" }
-egui-probe = { version = "0.1", features = ["derive"] }
-eframe = { version = "0.25", features = ["serde", "persistence"] }
-egui_extras = { version = "0.25", features = ["all_loaders"] }
+egui = { version = "0.26" }
+egui-probe = { version = "0.2", features = ["derive"] }
+eframe = { version = "0.26", features = ["serde", "persistence"] }
+egui_extras = { version = "0.26", features = ["all_loaders"] }
 syn = { version = "2.0", features = ["extra-traits"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }

diff --git a/src/ui.rs b/src/ui.rs
@@ -239,7 +239,7 @@ impl<T> Snarl<T> {
             .unwrap_or_else(|| ui.visuals().widgets.noninteractive.bg_stroke);
 
         let input = ui.ctx().input(|i| Input {
-            scroll_delta: i.scroll_delta.y,
+            scroll_delta: i.raw_scroll_delta.y,
             hover_pos: i.pointer.hover_pos(),
             modifiers: i.modifiers,
             // primary_pressed: i.pointer.primary_pressed(),
@@ -608,7 +608,7 @@ impl<T> Snarl<T> {
         if r.clicked() || r.dragged() {
             response.node_to_top = Some(node);
         }
-        let r = r.context_menu(|ui| {
+        r.context_menu(|ui| {
             viewer.node_menu(node, &inputs, &outputs, ui, snarl_state.scale(), self);
         });