From e4f89cf796265e8aaf043fb1d453fafab1165c19 Mon Sep 17 00:00:00 2001 From: aiongg Date: Fri, 13 Nov 2026 17:30:29 +0000 Subject: [PATCH] Repin the egui fork to craft/popup-above-parent dcd4de1fb (E34 on E33): an egui popup stays directly above the layer it opened from --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 28 ++++++++++++++-------------- crates/craft/src/egui_fork.rs | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71255e850..ebef27bf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3990,7 +3990,7 @@ dependencies = [ [[package]] name = "ecolor" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "bytemuck", "emath", @@ -4046,7 +4046,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "ahash", "bytemuck", @@ -4081,7 +4081,7 @@ dependencies = [ [[package]] name = "egui" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "accesskit", "ahash", @@ -4100,7 +4100,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "ahash", "bytemuck", @@ -4119,7 +4119,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "block2 0.6.2", "bytemuck", @@ -4139,7 +4139,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "bytemuck", "egui", @@ -4152,7 +4152,7 @@ dependencies = [ [[package]] name = "egui_kittest" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "eframe", "egui", @@ -4220,7 +4220,7 @@ dependencies = [ [[package]] name = "emath" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "bytemuck", ] @@ -4281,7 +4281,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" dependencies = [ "ahash", "bytemuck", @@ -4307,7 +4307,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" [[package]] name = "equivalent" @@ -12423,19 +12423,19 @@ dependencies = [ [[patch.unused]] name = "egui_demo_lib" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" [[patch.unused]] name = "egui_extras" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" [[patch.unused]] name = "egui_inspection" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" [[patch.unused]] name = "egui_system_font_provider" version = "0.37.0" -source = "git+https://github.com/aiongg/egui.git?rev=8026738cf65d34764ce97dc5e08b5b557ceae05f#8026738cf65d34764ce97dc5e08b5b557ceae05f" +source = "git+https://github.com/aiongg/egui.git?rev=dcd4de1fbc7502c3a2d69476d9665610947440df#dcd4de1fbc7502c3a2d69476d9665610947440df" diff --git a/Cargo.toml b/Cargo.toml index b6d9468d9..41aa02b6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -220,20 +220,20 @@ hayro-jbig2 = { path = "vendor/hayro-jbig2" } hayro-cmap = { path = "vendor/hayro-cmap" } hayro-postscript = { path = "vendor/hayro-postscript" } linesweeper = { path = "vendor/linesweeper" } -ecolor = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -emath = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -epaint = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -epaint_default_fonts = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui-winit = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui-wgpu = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui_glow = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui_extras = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui_kittest = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui_system_font_provider = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -eframe = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui_demo_lib = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } -egui_inspection = { git = "https://github.com/aiongg/egui.git", rev = "8026738cf65d34764ce97dc5e08b5b557ceae05f" } +ecolor = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +emath = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +epaint = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +epaint_default_fonts = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui-winit = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui-wgpu = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui_glow = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui_extras = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui_kittest = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui_system_font_provider = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +eframe = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui_demo_lib = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } +egui_inspection = { git = "https://github.com/aiongg/egui.git", rev = "dcd4de1fbc7502c3a2d69476d9665610947440df" } winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" } # symphonia's FLAC decoder restores LPC samples as `residual + (prediction as i32)`. In a valid diff --git a/crates/craft/src/egui_fork.rs b/crates/craft/src/egui_fork.rs index a9048984d..25041ad68 100644 --- a/crates/craft/src/egui_fork.rs +++ b/crates/craft/src/egui_fork.rs @@ -3,7 +3,7 @@ /// The egui fork the library is built and tested with. Apps patch egui to exactly this. pub const GIT: &str = "https://github.com/aiongg/egui.git"; /// The commit of [`GIT`]. -pub const REV: &str = "8026738cf65d34764ce97dc5e08b5b557ceae05f"; +pub const REV: &str = "dcd4de1fbc7502c3a2d69476d9665610947440df"; /// The packages the workspace patches to the fork (the `[patch.crates-io]` entries that name [`GIT`]). pub const PACKAGES: &[&str] = &[