poc persisted layout

Cargo.toml

@@ -18,6 +18,7 @@ rand = "0.8"
 petgraph = { version = "0.6", default-features = false, features = [
   "stable_graph",
   "matrix_graph",
+  "serde-1",
 ] }
 serde = { version = "1.0", features = ["derive"] }
 

examples/basic/src/main.rs

@@ -1,7 +1,7 @@
 use eframe::{run_native, App, CreationContext, NativeOptions};
 use egui::Context;
-use egui_graphs::{Graph, GraphView};
-use petgraph::stable_graph::StableGraph;
+use egui_graphs::{DefaultEdgeShape, DefaultGraphView, DefaultNodeShape, Graph, GraphView};
+use petgraph::{csr::DefaultIx, stable_graph::StableGraph, Directed};
 
 pub struct BasicApp {
     g: Graph,
@@ -17,7 +17,7 @@ impl BasicApp {
 impl App for BasicApp {
     fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
-            ui.add(&mut GraphView::new(&mut self.g));
+            ui.add(&mut DefaultGraphView::new(&mut self.g));
         });
     }
 }

examples/basic_custom/src/main.rs

@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext, NativeOptions};
 use egui::{Context, Pos2};
-use egui_graphs::{add_edge, add_node_custom, Graph, GraphView};
+use egui_graphs::{add_edge, add_node_custom, DefaultGraphView, Graph, SettingsStyle};
 use petgraph::stable_graph::StableGraph;
 
 pub struct BasicCustomApp {
@@ -16,6 +16,7 @@ impl BasicCustomApp {
         for position in positions {
             idxs.push(add_node_custom(&mut g, &(), |g_node| {
                 g_node.set_location(position);
+                g_node.set_label(position.to_string());
             }));
         }
 
@@ -30,7 +31,10 @@ impl BasicCustomApp {
 impl App for BasicCustomApp {
     fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
-            ui.add(&mut GraphView::new(&mut self.g));
+            ui.add(
+                &mut DefaultGraphView::new(&mut self.g)
+                    .with_styles(&SettingsStyle::default().with_labels_always(true)),
+            );
         });
     }
 }

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, Edge, Graph, GraphView, Node};
+use egui_graphs::{to_graph, DefaultGraphView, Edge, Graph, 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::new(&mut self.g)
+                &mut DefaultGraphView::new(&mut self.g)
                     .with_interactions(settings_interaction)
                     .with_navigations(settings_navigation)
                     .with_styles(settings_style)

examples/flex_nodes/src/main.rs

@@ -58,7 +58,7 @@ impl FlexNodesApp {
             }
         });
         CentralPanel::default().show(ctx, |ui| {
-            let widget = &mut GraphView::new(&mut self.g)
+            let widget = &mut GraphView::<_, _, _, _, _, _>::new(&mut self.g)
                 .with_interactions(
                     &SettingsInteraction::default()
                         .with_dragging_enabled(true)

examples/interactive/src/main.rs

@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::Context;
-use egui_graphs::{layouts, Graph, GraphView, SettingsInteraction, SettingsStyle};
+use egui_graphs::{DefaultGraphView, Graph, SettingsInteraction, SettingsStyle};
 use petgraph::stable_graph::StableGraph;
 
 pub struct InteractiveApp {
@@ -27,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::<_, _, _, _, _, _, layouts::Default>::new(&mut self.g)
+                &mut DefaultGraphView::new(&mut self.g)
                     .with_styles(style_settings)
                     .with_interactions(interaction_settings),
             );

examples/label_change/src/main.rs

@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::{CentralPanel, Context, SidePanel, TextEdit};
-use egui_graphs::{layouts, Graph, GraphView, SettingsInteraction, SettingsStyle};
+use egui_graphs::{DefaultGraphView, Graph, SettingsInteraction, SettingsStyle};
 use petgraph::stable_graph::{EdgeIndex, NodeIndex, StableGraph};
 
 pub struct LabelChangeApp {
@@ -52,7 +52,7 @@ impl LabelChangeApp {
             }
         });
         CentralPanel::default().show(ctx, |ui| {
-            let widget = &mut GraphView::<_, _, _, _, _, _, layouts::Default>::new(&mut self.g)
+            let widget = &mut DefaultGraphView::new(&mut self.g)
                 .with_interactions(
                     &SettingsInteraction::default()
                         .with_node_selection_enabled(true)

examples/multiple/src/main.rs

@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext, Frame};
 use egui::{CentralPanel, Context, Layout, SidePanel};
-use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsNavigation};
+use egui_graphs::{DefaultGraphView, Graph, SettingsInteraction, SettingsNavigation};
 use petgraph::stable_graph::StableGraph;
 
 pub struct BasicApp {
@@ -23,7 +23,7 @@ impl App for BasicApp {
             .show(ctx, |ui| {
                 ui.allocate_ui_with_layout(ui.max_rect().size(), Layout::default(), |ui| {
                     ui.add(
-                        &mut GraphView::new(&mut self.g)
+                        &mut DefaultGraphView::new(&mut self.g)
                             .with_navigations(
                                 &SettingsNavigation::default()
                                     .with_fit_to_screen_enabled(false)
@@ -45,7 +45,7 @@ impl App for BasicApp {
             .resizable(true)
             .show(ctx, |ui| {
                 ui.add(
-                    &mut GraphView::new(&mut self.g)
+                    &mut DefaultGraphView::new(&mut self.g)
                         .with_navigations(
                             &SettingsNavigation::default()
                                 .with_fit_to_screen_enabled(false)
@@ -63,7 +63,7 @@ impl App for BasicApp {
             });
         CentralPanel::default().show(ctx, |ui| {
             ui.add(
-                &mut GraphView::new(&mut self.g)
+                &mut DefaultGraphView::new(&mut self.g)
                     .with_navigations(
                         &SettingsNavigation::default()
                             .with_fit_to_screen_enabled(false)

examples/undirected/src/main.rs

@@ -1,6 +1,6 @@
 use eframe::{run_native, App, CreationContext};
 use egui::Context;
-use egui_graphs::{Graph, GraphView};
+use egui_graphs::{Graph, GraphView, LayoutRandom, LayoutStateRandom};
 use petgraph::{
     stable_graph::{StableGraph, StableUnGraph},
     Undirected,
@@ -20,7 +20,16 @@ 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::new(&mut self.g));
+            ui.add(&mut GraphView::<
+                _,
+                _,
+                _,
+                _,
+                _,
+                _,
+                LayoutStateRandom,
+                LayoutRandom,
+            >::new(&mut self.g));
         });
     }
 }

examples/window/src/main.rs

@@ -1,10 +1,10 @@
 use eframe::{run_native, App, CreationContext};
 use egui::{Context, Window};
-use egui_graphs::{Graph, GraphView};
+use egui_graphs::{DefaultGraphView, Graph};
 use petgraph::stable_graph::StableGraph;
 
 pub struct WindowApp {
-    g: Graph<(), ()>,
+    g: Graph,
 }
 
 impl WindowApp {
@@ -17,7 +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::new(&mut self.g));
+            ui.add(&mut DefaultGraphView::new(&mut self.g));
         });
     }
 }

src/draw/drawer.rs

@@ -1,10 +1,14 @@
 use std::marker::PhantomData;
 
-use egui::{Context, Painter, Shape};
+use egui::{util::id_type_map::SerializableAny, Context, Painter, Shape};
 use petgraph::graph::IndexType;
 use petgraph::EdgeType;
 
-use crate::{layouts::Layout, settings::SettingsStyle, Graph, Metadata};
+use crate::{
+    layouts::{Layout, LayoutState},
+    settings::SettingsStyle,
+    Graph, Metadata,
+};
 
 use super::{DisplayEdge, DisplayNode};
 
@@ -17,37 +21,40 @@ pub struct DrawContext<'a> {
     pub meta: &'a Metadata,
 }
 
-pub struct Drawer<'a, N, E, Ty, Ix, Nd, Ed, L>
+pub struct Drawer<'a, N, E, Ty, Ix, Nd, Ed, S, L>
 where
     N: Clone,
     E: Clone,
     Ty: EdgeType,
     Ix: IndexType,
     Nd: DisplayNode<N, E, Ty, Ix>,
     Ed: DisplayEdge<N, E, Ty, Ix, Nd>,
-    L: Layout,
+    S: LayoutState,
+    L: Layout<S>,
 {
     ctx: &'a DrawContext<'a>,
-    g: &'a mut Graph<N, E, Ty, Ix, Nd, Ed, L>,
-    postponed: Vec<Shape>,
-    _marker: PhantomData<(Nd, Ed, L)>,
+    g: &'a mut Graph<N, E, Ty, Ix, Nd, Ed>,
+    delayed: Vec<Shape>,
+
+    _marker: PhantomData<(Nd, Ed, L, S)>,
 }
 
-impl<'a, N, E, Ty, Ix, Nd, Ed, L> Drawer<'a, N, E, Ty, Ix, Nd, Ed, L>
+impl<'a, N, E, Ty, Ix, Nd, Ed, S, L> Drawer<'a, N, E, Ty, Ix, Nd, Ed, S, L>
 where
     N: Clone,
     E: Clone,
     Ty: EdgeType,
     Ix: IndexType,
     Nd: DisplayNode<N, E, Ty, Ix>,
     Ed: DisplayEdge<N, E, Ty, Ix, Nd>,
-    L: Layout,
+    S: LayoutState,
+    L: Layout<S>,
 {
-    pub fn new(g: &'a mut Graph<N, E, Ty, Ix, Nd, Ed, L>, ctx: &'a DrawContext<'a>) -> Self {
+    pub fn new(g: &'a mut Graph<N, E, Ty, Ix, Nd, Ed>, ctx: &'a DrawContext<'a>) -> Self {
         Drawer {
             ctx,
             g,
-            postponed: Vec::new(),
+            delayed: Vec::new(),
             _marker: PhantomData,
         }
     }
@@ -59,7 +66,7 @@ where
     }
 
     fn draw_postponed(&mut self) {
-        self.postponed.iter().for_each(|s| {
+        self.delayed.iter().for_each(|s| {
             self.ctx.painter.add(s.clone());
         });
     }
@@ -80,7 +87,7 @@ where
 
                 if n.selected() || n.dragged() {
                     for s in shapes {
-                        self.postponed.push(s);
+                        self.delayed.push(s);
                     }
                 } else {
                     for s in shapes {
@@ -112,7 +119,7 @@ where
 
                 if e.selected() {
                     for s in shapes {
-                        self.postponed.push(s);
+                        self.delayed.push(s);
                     }
                 } else {
                     for s in shapes {

src/elements/edge.rs

@@ -4,12 +4,12 @@ use petgraph::{
     stable_graph::{DefaultIx, EdgeIndex, IndexType},
     Directed, EdgeType,
 };
+use serde::{Deserialize, Serialize};
 
 use crate::{DefaultEdgeShape, DefaultNodeShape, DisplayEdge, DisplayNode};
 
 /// Stores properties of an [Edge]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct EdgeProps<E: Clone> {
     pub payload: E,
     pub order: usize,
@@ -18,8 +18,7 @@ pub struct EdgeProps<E: Clone> {
 }
 
 /// Stores properties of an edge that can be changed. Used to apply changes to the graph.
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Edge<
     N: Clone,
     E: Clone,

src/elements/node.rs

@@ -6,12 +6,12 @@ use petgraph::{
     stable_graph::{DefaultIx, IndexType, NodeIndex},
     Directed, EdgeType,
 };
+use serde::{Deserialize, Serialize};
 
 use crate::{DefaultNodeShape, DisplayNode};
 
 /// Stores properties of a [Node]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct NodeProps<N: Clone> {
     pub payload: N,
     pub location: Pos2,
@@ -20,7 +20,7 @@ pub struct NodeProps<N: Clone> {
     pub dragged: bool,
 }
 
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct Node<N, E, Ty = Directed, Ix = DefaultIx, D = DefaultNodeShape>
 where
     N: Clone,