From d099e43745ef1f7a09a23c65cd9c438ff10a1d7e Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Wed, 8 Jan 2025 18:39:22 +0100 Subject: [PATCH] another update --- Cargo.lock | 19 ++++++++++--------- Cargo.toml | 6 +++--- egui_plot/src/lib.rs | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec0d82c..b446c57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -913,7 +913,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "ecolor" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "bytemuck", "emath", @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "ahash", "bytemuck", @@ -961,10 +961,11 @@ dependencies = [ [[package]] name = "egui" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "accesskit", "ahash", + "bitflags 2.6.0", "emath", "epaint", "log", @@ -977,7 +978,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "ahash", "bytemuck", @@ -996,7 +997,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "accesskit_winit", "ahash", @@ -1016,7 +1017,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "ahash", "bytemuck", @@ -1044,7 +1045,7 @@ dependencies = [ [[package]] name = "emath" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "bytemuck", "serde", @@ -1113,7 +1114,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" dependencies = [ "ab_glyph", "ahash", @@ -1131,7 +1132,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.30.0" -source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e" +source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218" [[package]] name = "equivalent" diff --git a/Cargo.toml b/Cargo.toml index 1e2d2e2..32a8682 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,9 +41,9 @@ web-sys = "0.3.70" [patch.crates-io] -eframe = { git = "https://github.com/emilk/egui", rev = "938d8b0d2e2a551ac354d76d6208188e5942b21e" } # egui master 2025-01-03 -egui = { git = "https://github.com/emilk/egui", rev = "938d8b0d2e2a551ac354d76d6208188e5942b21e" } # egui master 2025-01-03 -emath = { git = "https://github.com/emilk/egui", rev = "938d8b0d2e2a551ac354d76d6208188e5942b21e" } # egui master 2025-01-03 +eframe = { git = "https://github.com/emilk/egui", rev = "f0d7c74e838b8e8920a22e7515990fbe057ec218" } # egui master 2025-01-08 +egui = { git = "https://github.com/emilk/egui", rev = "f0d7c74e838b8e8920a22e7515990fbe057ec218" } # egui master 2025-01-08 +emath = { git = "https://github.com/emilk/egui", rev = "f0d7c74e838b8e8920a22e7515990fbe057ec218" } # egui master 2025-01-08 # If you want to use the bleeding edge version of egui and eframe: # egui = { git = "https://github.com/emilk/egui", branch = "master" } diff --git a/egui_plot/src/lib.rs b/egui_plot/src/lib.rs index f133400..d5b0fe5 100644 --- a/egui_plot/src/lib.rs +++ b/egui_plot/src/lib.rs @@ -1103,7 +1103,7 @@ impl<'a> Plot<'a> { // For instance: The user is painting another interactive widget on top of the plot // but they still want to be able to pan/zoom the plot. if let (true, Some(hover_pos)) = ( - response.contains_pointer, + response.contains_pointer(), ui.input(|i| i.pointer.hover_pos()), ) { if allow_zoom.any() {