From a04ce8de5e250987cc7496d22cafea66c2595ce5 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Mon, 16 Sep 2024 16:30:07 +0200 Subject: [PATCH] Update egui --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8016618d972aa..c7b01e040aa9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1777,7 +1777,7 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecolor" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "bytemuck", "emath", @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "ahash", "bytemuck", @@ -1824,7 +1824,7 @@ dependencies = [ [[package]] name = "egui" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "accesskit", "ahash", @@ -1841,7 +1841,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "ahash", "bytemuck", @@ -1860,7 +1860,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "accesskit_winit", "ahash", @@ -1900,7 +1900,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "ahash", "egui", @@ -1916,7 +1916,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "ahash", "bytemuck", @@ -1989,7 +1989,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "bytemuck", "serde", @@ -2090,7 +2090,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" dependencies = [ "ab_glyph", "ahash", @@ -2109,7 +2109,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=66076101e12eee01dec374285521b0bed4ecc40a#66076101e12eee01dec374285521b0bed4ecc40a" +source = "git+https://github.com/emilk/egui.git?rev=89da356b79f7c7e11ac225e0f7c81ff953169db6#89da356b79f7c7e11ac225e0f7c81ff953169db6" [[package]] name = "equivalent" diff --git a/Cargo.toml b/Cargo.toml index 66e2f4e619a32..95347bfefa09f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -514,12 +514,12 @@ missing_errors_doc = "allow" # 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 = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 -eframe = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 -egui = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 -egui_extras = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 -egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 -emath = { git = "https://github.com/emilk/egui.git", rev = "66076101e12eee01dec374285521b0bed4ecc40a" } # egui master 2024-09-06 +ecolor = { git = "https://github.com/emilk/egui.git", rev = "89da356b79f7c7e11ac225e0f7c81ff953169db6" } # egui master 2024-09-16 +eframe = { git = "https://github.com/emilk/egui.git", rev = "89da356b79f7c7e11ac225e0f7c81ff953169db6" } # egui master 2024-09-16 +egui = { git = "https://github.com/emilk/egui.git", rev = "89da356b79f7c7e11ac225e0f7c81ff953169db6" } # egui master 2024-09-16 +egui_extras = { git = "https://github.com/emilk/egui.git", rev = "89da356b79f7c7e11ac225e0f7c81ff953169db6" } # egui master 2024-09-16 +egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "89da356b79f7c7e11ac225e0f7c81ff953169db6" } # egui master 2024-09-16 +emath = { git = "https://github.com/emilk/egui.git", rev = "89da356b79f7c7e11ac225e0f7c81ff953169db6" } # egui master 2024-09-16 # Useful while developing: # ecolor = { path = "../../egui/crates/ecolor" }