From 093db3f095155bbdf42cfc9a25593fa1be8e13de Mon Sep 17 00:00:00 2001 From: Antoine Beyeler Date: Wed, 6 Mar 2024 18:36:44 +0100 Subject: [PATCH] Bump egui master Fixes #5310 --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02fde276d907..aac78a451e63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1567,7 +1567,7 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecolor" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "bytemuck", "serde", @@ -1576,7 +1576,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "bytemuck", "cocoa", @@ -1611,7 +1611,7 @@ dependencies = [ [[package]] name = "egui" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "accesskit", "ahash", @@ -1627,7 +1627,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "bytemuck", "document-features", @@ -1645,7 +1645,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "accesskit_winit", "arboard", @@ -1674,7 +1674,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "egui", "ehttp", @@ -1689,7 +1689,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "bytemuck", "egui", @@ -1706,7 +1706,7 @@ dependencies = [ [[package]] name = "egui_plot" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "egui", ] @@ -1748,7 +1748,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "bytemuck", "serde", @@ -1849,7 +1849,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.26.2" -source = "git+https://github.com/emilk/egui.git?rev=e29022efc4783fe06842a46371d5bd88e3f13bdd#e29022efc4783fe06842a46371d5bd88e3f13bdd" +source = "git+https://github.com/emilk/egui.git?rev=a1d5145c16aba4d0b11668d496735d07520d0339#a1d5145c16aba4d0b11668d496735d07520d0339" dependencies = [ "ab_glyph", "ahash", diff --git a/Cargo.toml b/Cargo.toml index 5e5f244eef7e..26ca03a5bf29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -284,13 +284,13 @@ debug = true # As a last resport, patch with a commit to our own repository. # ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk. -ecolor = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 -eframe = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 -egui = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 -egui_extras = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 -egui_plot = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 -egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 -emath = { git = "https://github.com/emilk/egui.git", rev = "e29022efc4783fe06842a46371d5bd88e3f13bdd" } # egui master 2024-02-29 +ecolor = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 +eframe = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 +egui = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 +egui_extras = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 +egui_plot = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 +egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 +emath = { git = "https://github.com/emilk/egui.git", rev = "a1d5145c16aba4d0b11668d496735d07520d0339" } # egui master 2024-03-06 # Useful while developing: # ecolor = { path = "../../egui/crates/ecolor" }