Skip to content

Commit 80e2199

Browse files
authored
Update egui (#67)
1 parent 4a16b88 commit 80e2199

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

Cargo.lock

+10-9
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
913913
[[package]]
914914
name = "ecolor"
915915
version = "0.30.0"
916-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
916+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
917917
dependencies = [
918918
"bytemuck",
919919
"emath",
@@ -923,7 +923,7 @@ dependencies = [
923923
[[package]]
924924
name = "eframe"
925925
version = "0.30.0"
926-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
926+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
927927
dependencies = [
928928
"ahash",
929929
"bytemuck",
@@ -961,10 +961,11 @@ dependencies = [
961961
[[package]]
962962
name = "egui"
963963
version = "0.30.0"
964-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
964+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
965965
dependencies = [
966966
"accesskit",
967967
"ahash",
968+
"bitflags 2.6.0",
968969
"emath",
969970
"epaint",
970971
"log",
@@ -977,7 +978,7 @@ dependencies = [
977978
[[package]]
978979
name = "egui-wgpu"
979980
version = "0.30.0"
980-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
981+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
981982
dependencies = [
982983
"ahash",
983984
"bytemuck",
@@ -996,7 +997,7 @@ dependencies = [
996997
[[package]]
997998
name = "egui-winit"
998999
version = "0.30.0"
999-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
1000+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
10001001
dependencies = [
10011002
"accesskit_winit",
10021003
"ahash",
@@ -1016,7 +1017,7 @@ dependencies = [
10161017
[[package]]
10171018
name = "egui_glow"
10181019
version = "0.30.0"
1019-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
1020+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
10201021
dependencies = [
10211022
"ahash",
10221023
"bytemuck",
@@ -1044,7 +1045,7 @@ dependencies = [
10441045
[[package]]
10451046
name = "emath"
10461047
version = "0.30.0"
1047-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
1048+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
10481049
dependencies = [
10491050
"bytemuck",
10501051
"serde",
@@ -1113,7 +1114,7 @@ dependencies = [
11131114
[[package]]
11141115
name = "epaint"
11151116
version = "0.30.0"
1116-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
1117+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
11171118
dependencies = [
11181119
"ab_glyph",
11191120
"ahash",
@@ -1131,7 +1132,7 @@ dependencies = [
11311132
[[package]]
11321133
name = "epaint_default_fonts"
11331134
version = "0.30.0"
1134-
source = "git+https://github.com/emilk/egui?rev=938d8b0d2e2a551ac354d76d6208188e5942b21e#938d8b0d2e2a551ac354d76d6208188e5942b21e"
1135+
source = "git+https://github.com/emilk/egui?rev=f0d7c74e838b8e8920a22e7515990fbe057ec218#f0d7c74e838b8e8920a22e7515990fbe057ec218"
11351136

11361137
[[package]]
11371138
name = "equivalent"

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ web-sys = "0.3.70"
4141

4242

4343
[patch.crates-io]
44-
eframe = { git = "https://github.com/emilk/egui", rev = "938d8b0d2e2a551ac354d76d6208188e5942b21e" } # egui master 2025-01-03
45-
egui = { git = "https://github.com/emilk/egui", rev = "938d8b0d2e2a551ac354d76d6208188e5942b21e" } # egui master 2025-01-03
46-
emath = { git = "https://github.com/emilk/egui", rev = "938d8b0d2e2a551ac354d76d6208188e5942b21e" } # egui master 2025-01-03
44+
eframe = { git = "https://github.com/emilk/egui", rev = "f0d7c74e838b8e8920a22e7515990fbe057ec218" } # egui master 2025-01-08
45+
egui = { git = "https://github.com/emilk/egui", rev = "f0d7c74e838b8e8920a22e7515990fbe057ec218" } # egui master 2025-01-08
46+
emath = { git = "https://github.com/emilk/egui", rev = "f0d7c74e838b8e8920a22e7515990fbe057ec218" } # egui master 2025-01-08
4747

4848
# If you want to use the bleeding edge version of egui and eframe:
4949
# egui = { git = "https://github.com/emilk/egui", branch = "master" }

egui_plot/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ impl<'a> Plot<'a> {
11031103
// For instance: The user is painting another interactive widget on top of the plot
11041104
// but they still want to be able to pan/zoom the plot.
11051105
if let (true, Some(hover_pos)) = (
1106-
response.contains_pointer,
1106+
response.contains_pointer(),
11071107
ui.input(|i| i.pointer.hover_pos()),
11081108
) {
11091109
if allow_zoom.any() {

0 commit comments

Comments
 (0)