Skip to content

Commit

Permalink
Egui version update (#187)
Browse files Browse the repository at this point in the history
Also solves #186
  • Loading branch information
blitzarx1 committed Apr 16, 2024
1 parent be8ae6a commit 09c242b
Show file tree
Hide file tree
Showing 13 changed files with 477 additions and 823 deletions.
1,250 changes: 452 additions & 798 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "egui_graphs"
version = "0.19.0"
version = "0.20.0"
authors = ["Dmitrii Samsonov <blitzarx1@gmail.com>"]
license = "MIT"
homepage = "https://github.com/blitzarx1/egui_graphs"
Expand All @@ -9,7 +9,7 @@ description = "Interactive graph visualization widget for rust powered by egui"
edition = "2021"

[dependencies]
egui = { version = "0.26", default-features = false }
egui = { version = "0.27", default-features = false }
rand = "0.8"
petgraph = { version = "0.6", default-features = false, features = ["stable_graph", "matrix_graph"] }
crossbeam = { version = "0.8", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions examples/basic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26.0"
eframe = "0.26.0"
egui = "0.27.0"
eframe = "0.27.0"
petgraph = "0.6"
6 changes: 3 additions & 3 deletions examples/bevy_basic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "MIT"
edition = "2021"

[dependencies]
bevy = "0.12"
bevy_egui = "0.24.0"
egui_graphs = "0.17.1"
bevy = "0.13"
bevy_egui = "0.26.0"
egui_graphs = "0.19.0"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions examples/configurable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../", features = ["events"] }
egui = "0.26"
egui = "0.27"
eframe = "0.27"
serde_json = "1.0"
eframe = "0.26"
petgraph = "0.6"
fdg-sim = "0.9"
rand = "0.8"
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_draw/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../"}
egui = "0.26"
eframe = "0.26"
egui = "0.27"
eframe = "0.27"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions examples/interactive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26"
eframe = "0.26"
egui = "0.27"
eframe = "0.27"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions examples/label_change/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26"
eframe = "0.26"
egui = "0.27"
eframe = "0.27"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions examples/multiple/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26"
eframe = "0.26"
egui = "0.27"
eframe = "0.27"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions examples/undirected/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26"
eframe = "0.26"
egui = "0.27"
eframe = "0.27"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions examples/wasm_custom_draw/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26"
eframe = "0.26"
egui = "0.27"
eframe = "0.27"
petgraph = "0.6"

# Wasm related dependencies
Expand Down
4 changes: 2 additions & 2 deletions examples/window/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"

[dependencies]
egui_graphs = { path = "../../" }
egui = "0.26.0"
eframe = "0.26.0"
egui = "0.27.0"
eframe = "0.27.0"
petgraph = "0.6"
4 changes: 2 additions & 2 deletions src/graph_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ where

if !resp.dragged_by(PointerButton::Primary)
&& !resp.drag_started_by(PointerButton::Primary)
&& !resp.drag_released_by(PointerButton::Primary)
&& !resp.drag_stopped_by(PointerButton::Primary)
{
return;
}
Expand All @@ -351,7 +351,7 @@ where
self.move_node(n_idx_dragged, delta_in_graph_coords);
}

if resp.drag_released() && self.g.dragged_node().is_some() {
if resp.drag_stopped() && self.g.dragged_node().is_some() {
let n_idx = self.g.dragged_node().unwrap();
self.set_drag_end(n_idx);
}
Expand Down

0 comments on commit 09c242b

Please sign in to comment.