From 309d600c6daa400ac02d8aff5ee60d0cda670f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= Date: Thu, 19 Sep 2024 12:52:26 +0200 Subject: [PATCH] desktop: Bump `egui` to latest `master`, set theme instead of visuals --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- core/Cargo.toml | 2 +- desktop/Cargo.toml | 6 +++--- desktop/src/gui/dialogs/open_dialog.rs | 2 +- desktop/src/gui/theme.rs | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3dc6469b..2e13f26af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1430,7 +1430,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "ecolor" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "bytemuck", "emath", @@ -1439,7 +1439,7 @@ dependencies = [ [[package]] name = "egui" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "ahash", "emath", @@ -1451,7 +1451,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "ahash", "bytemuck", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "ahash", "arboard", @@ -1485,7 +1485,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "ahash", "egui", @@ -1503,7 +1503,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "bytemuck", ] @@ -1632,7 +1632,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" dependencies = [ "ab_glyph", "ahash", @@ -1648,7 +1648,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.28.1" -source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" +source = "git+https://github.com/emilk/egui.git?rev=e0f0b7f47f4094967530214aec060b9f1ce5954e#e0f0b7f47f4094967530214aec060b9f1ce5954e" [[package]] name = "equivalent" diff --git a/Cargo.toml b/Cargo.toml index 62ece68e2..de5b6c7a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } naga = { version = "22.1.0", features = ["wgsl-out"] } wgpu = "22.1.0" -egui = { git = "https://github.com/emilk/egui.git", rev = "f4697bc007447c6c2674beb4e25f599fb7afa093" } +egui = { git = "https://github.com/emilk/egui.git", rev = "e0f0b7f47f4094967530214aec060b9f1ce5954e" } clap = { version = "4.5.17", features = ["derive"] } cpal = "0.15.3" anyhow = "1.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index 1141a5579..c8b590442 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] } scopeguard = "1.2.0" fluent-templates = "0.10.1" egui = { workspace = true, optional = true } -egui_extras = { git = "https://github.com/emilk/egui.git", rev = "f4697bc007447c6c2674beb4e25f599fb7afa093", default-features = false, optional = true } +egui_extras = { git = "https://github.com/emilk/egui.git", rev = "e0f0b7f47f4094967530214aec060b9f1ce5954e", default-features = false, optional = true } png = { version = "0.17.13", optional = true } flv-rs = { path = "../flv" } async-channel = { workspace = true } diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 23956aca1..ced2f9a85 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -14,10 +14,10 @@ workspace = true clap = { workspace = true } cpal = { workspace = true } egui = { workspace = true } -egui_extras = { git = "https://github.com/emilk/egui.git", rev = "f4697bc007447c6c2674beb4e25f599fb7afa093", default-features = false, features = ["image"] } -egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "f4697bc007447c6c2674beb4e25f599fb7afa093", features = ["winit"] } +egui_extras = { git = "https://github.com/emilk/egui.git", rev = "e0f0b7f47f4094967530214aec060b9f1ce5954e", default-features = false, features = ["image"] } +egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "e0f0b7f47f4094967530214aec060b9f1ce5954e", features = ["winit"] } image = { workspace = true, features = ["png"] } -egui-winit = { git = "https://github.com/emilk/egui.git", rev = "f4697bc007447c6c2674beb4e25f599fb7afa093" } +egui-winit = { git = "https://github.com/emilk/egui.git", rev = "e0f0b7f47f4094967530214aec060b9f1ce5954e" } fontdb = "0.22" ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] } ruffle_render = { path = "../render", features = ["clap"] } diff --git a/desktop/src/gui/dialogs/open_dialog.rs b/desktop/src/gui/dialogs/open_dialog.rs index e1f7f9945..840919ec5 100644 --- a/desktop/src/gui/dialogs/open_dialog.rs +++ b/desktop/src/gui/dialogs/open_dialog.rs @@ -525,7 +525,7 @@ impl OpenDialog { ui.add_sized( ui.available_size(), Slider::new(&mut self.framerate, 0.0..=100.0) - .clamp_to_range(false) + .clamping(egui::SliderClamping::Never) .suffix(text(locale, "custom-framerate-suffix")), ); }); diff --git a/desktop/src/gui/theme.rs b/desktop/src/gui/theme.rs index a5cfbdce0..9b1456908 100644 --- a/desktop/src/gui/theme.rs +++ b/desktop/src/gui/theme.rs @@ -137,9 +137,9 @@ impl ThemeController { } fn set_theme_internal(&self, data: MutexGuard<'_, ThemeControllerData>, theme: Theme) { - data.egui_ctx.set_visuals(match theme { - Theme::Light => egui::Visuals::light(), - Theme::Dark => egui::Visuals::dark(), + data.egui_ctx.set_theme(match theme { + Theme::Light => egui::Theme::Light, + Theme::Dark => egui::Theme::Dark, }); if let Some(window) = data.window.upgrade() { window.request_redraw();