diff --git a/Cargo.toml b/Cargo.toml index d765294..4adbd6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,11 @@ [workspace] + +resolver = "2" + members = [ "egui_node_graph", "egui_node_graph_example", ] + +[egui_node_graph_example.profile.release] +opt-level = 2 # fast and small wasm \ No newline at end of file diff --git a/egui_node_graph/Cargo.toml b/egui_node_graph/Cargo.toml index d10dbd8..ad99260 100644 --- a/egui_node_graph/Cargo.toml +++ b/egui_node_graph/Cargo.toml @@ -15,7 +15,7 @@ workspace = ".." persistence = ["serde", "slotmap/serde", "smallvec/serde", "egui/persistence"] [dependencies] -egui = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c" } +egui = "0.27" slotmap = { version = "1.0" } smallvec = { version = "1.10.0" } serde = { version = "1.0", optional = true, features = ["derive"] } diff --git a/egui_node_graph/src/editor_ui.rs b/egui_node_graph/src/editor_ui.rs index 4750df7..120dfcf 100644 --- a/egui_node_graph/src/editor_ui.rs +++ b/egui_node_graph/src/editor_ui.rs @@ -123,7 +123,7 @@ where // Zoom only within area where graph is shown if ui.rect_contains_pointer(clip_rect) { - let scroll_delta = ui.input(|i| i.scroll_delta.y); + let scroll_delta = ui.input(|i| i.smooth_scroll_delta.y); if scroll_delta != 0.0 { let zoom_delta = (scroll_delta * 0.002).exp(); self.zoom(ui, zoom_delta); @@ -187,7 +187,7 @@ where let cursor_pos = ui .ctx() .input(|i| i.pointer.hover_pos().unwrap_or(Pos2::ZERO)); - let mut cursor_in_editor = resp.hovered(); + let mut cursor_in_editor = resp.contains_pointer(); let mut cursor_in_finder = false; // Gets filled with the node metrics as they are drawn @@ -219,7 +219,7 @@ where click_on_background = true; } else if r.drag_started() { drag_started_on_background = true; - } else if r.drag_released() { + } else if r.drag_stopped() { drag_released_on_background = true; } @@ -247,7 +247,7 @@ where /* Draw the node finder, if open */ let mut should_close_node_finder = false; if let Some(ref mut node_finder) = self.node_finder { - let mut node_finder_area = Area::new("node_finder").order(Order::Foreground); + let mut node_finder_area = Area::new(Id::new("node_finder")).order(Order::Foreground); if let Some(pos) = node_finder.position { node_finder_area = node_finder_area.current_pos(pos); } diff --git a/egui_node_graph/src/scale.rs b/egui_node_graph/src/scale.rs index fb51955..63b8f2d 100644 --- a/egui_node_graph/src/scale.rs +++ b/egui_node_graph/src/scale.rs @@ -1,8 +1,5 @@ use egui::epaint::Shadow; -use egui::{ - style::{Margin, WidgetVisuals}, - Rounding, Stroke, Style, Vec2, -}; +use egui::{style::WidgetVisuals, Margin, Rounding, Stroke, Style, Vec2}; // Copied from https://github.com/gzp-crey/shine @@ -52,7 +49,7 @@ impl Scale for Stroke { impl Scale for Shadow { fn scale(&mut self, amount: f32) { - self.extrusion *= amount.clamp(0.4, 1.); + self.spread *= amount.clamp(0.4, 1.); } } diff --git a/egui_node_graph_example/Cargo.toml b/egui_node_graph_example/Cargo.toml index 969bc8e..9bc8375 100644 --- a/egui_node_graph_example/Cargo.toml +++ b/egui_node_graph_example/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.56" crate-type = ["cdylib", "rlib"] [dependencies] -eframe = { git = "https://github.com/emilk/egui", rev = "3a8e2348a5d18262a714ccfbcba115176848475c" } +eframe = "0.27" egui_node_graph = { path = "../egui_node_graph" } anyhow = "1.0" serde = { version = "1.0", optional = true } @@ -18,5 +18,3 @@ serde = { version = "1.0", optional = true } default = [] persistence = ["serde", "egui_node_graph/persistence", "eframe/persistence"] -[profile.release] -opt-level = 2 # fast and small wasm