bumped egui version

blitzarx1 · Sep 27, 2024 · 8340966 · 8340966
1 parent 77a7eaa
commit 8340966
Show file tree

Hide file tree

Showing 16 changed files with 552 additions and 596 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "egui_graphs"
-version = "0.21.1"
+version = "0.22.0"
 authors = ["Dmitrii Samsonov <[email protected]>"]
 license = "MIT"
 homepage = "https://github.com/blitzarx1/egui_graphs"
@@ -11,7 +11,7 @@ keywords = ["egui", "ui", "graph", "node-graph"]
 categories = ["gui", "visualization"]
 
 [dependencies]
-egui = { version = "0.28", default-features = false }
+egui = { version = "0.29", default-features = false }
 rand = "0.8"
 petgraph = { version = "0.6", default-features = false, features = [
   "stable_graph",

diff --git a/examples/animated_nodes/Cargo.toml b/examples/animated_nodes/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/basic/Cargo.toml b/examples/basic/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/bevy_basic/Cargo.toml b/examples/bevy_basic/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-egui_graphs = { path = "../../" }
-bevy = "0.14.2"
-bevy_egui = "0.29.0"
+egui_graphs = "0.21"
+bevy = "0.14"
+bevy_egui = "0.29"
 petgraph = "0.6"
diff --git a/examples/bevy_basic/src/main.rs b/examples/bevy_basic/src/main.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 use bevy_egui::{egui, EguiContexts, EguiPlugin};
-use egui_graphs::{DefaultEdgeShape, DefaultNodeShape, Graph, GraphView};
+use egui_graphs::{Graph, GraphView};
 use petgraph::stable_graph::StableGraph;
 
 fn main() {
@@ -46,13 +46,6 @@ fn update_graph(mut contexts: EguiContexts, mut q_graph: Query<&mut BasicGraph>)
     let mut graph = q_graph.single_mut();
 
     egui::CentralPanel::default().show(ctx, |ui| {
-        ui.add(&mut GraphView::<
-            _,
-            _,
-            _,
-            _,
-            DefaultNodeShape,
-            DefaultEdgeShape,
-        >::new(&mut graph.0));
+        ui.add(&mut GraphView::new(&mut graph.0));
     });
 }
diff --git a/examples/demo/Cargo.toml b/examples/demo/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../", features = ["events"] }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 serde_json = "1.0"
 petgraph = "0.6"
 fdg = { git = "https://github.com/grantshandy/fdg" }

diff --git a/examples/flex_nodes/Cargo.toml b/examples/flex_nodes/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/interactive/Cargo.toml b/examples/interactive/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/label_change/Cargo.toml b/examples/label_change/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/multiple/Cargo.toml b/examples/multiple/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/multiple/src/main.rs b/examples/multiple/src/main.rs
@@ -23,25 +23,26 @@ impl App for BasicApp {
             .default_width(available_width / 3.)
             .resizable(true)
             .show(ctx, |ui| {
-                ui.child_ui(ui.max_rect(), Layout::default(), None);
-                ui.add(
-                    &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(
-                        &mut self.g,
-                    )
-                    .with_navigations(
-                        &SettingsNavigation::default()
-                            .with_fit_to_screen_enabled(false)
-                            .with_zoom_and_pan_enabled(true),
-                    )
-                    .with_interactions(
-                        &SettingsInteraction::default()
-                            .with_node_selection_multi_enabled(true)
-                            .with_node_selection_enabled(true)
-                            .with_edge_selection_enabled(true)
-                            .with_edge_selection_multi_enabled(true)
-                            .with_dragging_enabled(true),
-                    ),
-                )
+                ui.allocate_ui_with_layout(ui.max_rect().size(), Layout::default(), |ui| {
+                    ui.add(
+                        &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(
+                            &mut self.g,
+                        )
+                        .with_navigations(
+                            &SettingsNavigation::default()
+                                .with_fit_to_screen_enabled(false)
+                                .with_zoom_and_pan_enabled(true),
+                        )
+                        .with_interactions(
+                            &SettingsInteraction::default()
+                                .with_node_selection_multi_enabled(true)
+                                .with_node_selection_enabled(true)
+                                .with_edge_selection_enabled(true)
+                                .with_edge_selection_multi_enabled(true)
+                                .with_dragging_enabled(true),
+                        ),
+                    );
+                });
             });
         SidePanel::right("right_panel")
             .default_width(available_width / 3.)

diff --git a/examples/rainbow_edges/Cargo.toml b/examples/rainbow_edges/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/undirected/Cargo.toml b/examples/undirected/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
diff --git a/examples/wasm_custom_draw/Cargo.toml b/examples/wasm_custom_draw/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"
 
 # Wasm related dependencies

diff --git a/examples/window/Cargo.toml b/examples/window/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 egui_graphs = { path = "../../" }
-egui = "0.28"
-eframe = "0.28"
+egui = "0.29"
+eframe = "0.29"
 petgraph = "0.6"