0.22.0 (#215)

* bumped egui version * fixed default usages
blitzarx1 · Sep 27, 2024 · cfb5408 · cfb5408
1 parent 77a7eaa
commit cfb5408
Show file tree

Hide file tree

Showing 22 changed files with 585 additions and 654 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/README.md b/README.md
@@ -35,8 +35,8 @@ Combining this feature with custom node draw function allows to implement custom
 ### Persistence
 To use egui `persistence` feature you need to enable `egui_persistence` feature of this crate. For example:
 ```toml
-egui_graphs = { version = "0.21", features = ["egui_persistence"]}
-egui = {version="0.23", features = ["persistence"]}
+egui_graphs = { version = "0.22", features = ["egui_persistence"]}
+egui = {version="0.29", features = ["persistence"]}
 ```
 
 ## Examples

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/demo/src/main.rs b/examples/demo/src/main.rs
@@ -5,7 +5,7 @@ use drawers::ValuesSectionDebug;
 use eframe::{run_native, App, CreationContext};
 use egui::{CollapsingHeader, Context, Pos2, ScrollArea, Ui, Vec2};
 use egui_graphs::events::Event;
-use egui_graphs::{to_graph, DefaultEdgeShape, DefaultNodeShape, Edge, Graph, GraphView, Node};
+use egui_graphs::{to_graph, Edge, Graph, GraphView, Node};
 use fdg::fruchterman_reingold::{FruchtermanReingold, FruchtermanReingoldConfiguration};
 use fdg::nalgebra::{Const, OPoint};
 use fdg::{Force, ForceGraph};
@@ -511,7 +511,7 @@ impl App for DemoApp {
             let settings_style = &egui_graphs::SettingsStyle::new()
                 .with_labels_always(self.settings_style.labels_always);
             ui.add(
-                &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g)
+                &mut GraphView::new(&mut self.g)
                     .with_interactions(settings_interaction)
                     .with_navigations(settings_navigation)
                     .with_styles(settings_style)

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/interactive/src/main.rs b/examples/interactive/src/main.rs
@@ -1,8 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::Context;
-use egui_graphs::{
-    DefaultEdgeShape, DefaultNodeShape, Graph, GraphView, SettingsInteraction, SettingsStyle,
-};
+use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsStyle};
 use petgraph::stable_graph::StableGraph;
 
 pub struct InteractiveApp {
@@ -29,7 +27,7 @@ impl App for InteractiveApp {
                 .with_edge_selection_multi_enabled(true);
             let style_settings = &SettingsStyle::new().with_labels_always(true);
             ui.add(
-                &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g)
+                &mut GraphView::new(&mut self.g)
                     .with_styles(style_settings)
                     .with_interactions(interaction_settings),
             );

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/label_change/src/main.rs b/examples/label_change/src/main.rs
@@ -1,8 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::{CentralPanel, Context, SidePanel, TextEdit};
-use egui_graphs::{
-    DefaultEdgeShape, DefaultNodeShape, Graph, GraphView, SettingsInteraction, SettingsStyle,
-};
+use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsStyle};
 use petgraph::stable_graph::{EdgeIndex, NodeIndex, StableGraph};
 
 pub struct LabelChangeApp {
@@ -54,14 +52,13 @@ impl LabelChangeApp {
             }
         });
         CentralPanel::default().show(ctx, |ui| {
-            let widget =
-                &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g)
-                    .with_interactions(
-                        &SettingsInteraction::default()
-                            .with_node_selection_enabled(true)
-                            .with_edge_selection_enabled(true),
-                    )
-                    .with_styles(&SettingsStyle::default().with_labels_always(true));
+            let widget = &mut GraphView::new(&mut self.g)
+                .with_interactions(
+                    &SettingsInteraction::default()
+                        .with_node_selection_enabled(true)
+                        .with_edge_selection_enabled(true),
+                )
+                .with_styles(&SettingsStyle::default().with_labels_always(true));
             ui.add(widget);
         });
     }

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
@@ -1,8 +1,6 @@
 use eframe::{run_native, App, CreationContext, Frame};
 use egui::{CentralPanel, Context, Layout, SidePanel};
-use egui_graphs::{
-    DefaultEdgeShape, DefaultNodeShape, Graph, GraphView, SettingsInteraction, SettingsNavigation,
-};
+use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsNavigation};
 use petgraph::stable_graph::StableGraph;
 
 pub struct BasicApp {
@@ -23,52 +21,49 @@ 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::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.)
             .resizable(true)
             .show(ctx, |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),
-                    ),
+                    &mut GraphView::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),
+                        ),
                 )
             });
         CentralPanel::default().show(ctx, |ui| {
             ui.add(
-                &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g)
+                &mut GraphView::new(&mut self.g)
                     .with_navigations(
                         &SettingsNavigation::default()
                             .with_fit_to_screen_enabled(false)
@@ -104,7 +99,7 @@ fn generate_graph() -> StableGraph<(), ()> {
 fn main() {
     let native_options = eframe::NativeOptions::default();
     run_native(
-        "egui_graphs_basic_demo",
+        "egui_graphs_multiple_demo",
         native_options,
         Box::new(|cc| Ok(Box::new(BasicApp::new(cc)))),
     )

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/undirected/src/main.rs b/examples/undirected/src/main.rs
@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::Context;
-use egui_graphs::{DefaultEdgeShape, DefaultNodeShape, Graph, GraphView};
+use egui_graphs::{Graph, GraphView};
 use petgraph::{
     stable_graph::{DefaultIx, StableGraph, StableUnGraph},
     Undirected,
@@ -20,14 +20,7 @@ impl UndirectedApp {
 impl App for UndirectedApp {
     fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
-            ui.add(&mut GraphView::<
-                _,
-                _,
-                _,
-                _,
-                DefaultNodeShape,
-                DefaultEdgeShape,
-            >::new(&mut self.g));
+            ui.add(&mut GraphView::new(&mut self.g));
         });
     }
 }

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"
diff --git a/examples/window/src/main.rs b/examples/window/src/main.rs
@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::{Context, Window};
-use egui_graphs::{DefaultEdgeShape, DefaultNodeShape, Graph, GraphView};
+use egui_graphs::{Graph, GraphView};
 use petgraph::stable_graph::StableGraph;
 
 pub struct WindowApp {
@@ -17,14 +17,7 @@ impl WindowApp {
 impl App for WindowApp {
     fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) {
         Window::new("graph").show(ctx, |ui| {
-            ui.add(&mut GraphView::<
-                _,
-                _,
-                _,
-                _,
-                DefaultNodeShape,
-                DefaultEdgeShape,
-            >::new(&mut self.g));
+            ui.add(&mut GraphView::new(&mut self.g));
         });
     }
 }