Skip to content

Commit

Permalink
desktop: Bump egui to latest master, set theme instead of visuals
Browse files Browse the repository at this point in the history
  • Loading branch information
torokati44 authored and kjarosh committed Sep 19, 2024
1 parent 0729e79 commit 309d600
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/gui/dialogs/open_dialog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
);
});
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/gui/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 309d600

Please sign in to comment.