liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop: Bump `egui` to latest `master`, set theme instead of visuals

This commit is contained in:
TÖRÖK Attila 2024-09-19 12:52:26 +02:00 committed by Kamil Jarosz
parent 0729e79659
commit 309d600c6d
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -1430,7 +1430,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.28.1" 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 = [ dependencies = [
"bytemuck", "bytemuck",
"emath", "emath",
@ -1439,7 +1439,7 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.28.1" 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 = [ dependencies = [
"ahash", "ahash",
"emath", "emath",
@ -1451,7 +1451,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-wgpu" name = "egui-wgpu"
version = "0.28.1" 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 = [ dependencies = [
"ahash", "ahash",
"bytemuck", "bytemuck",
@ -1469,7 +1469,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.28.1" 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 = [ dependencies = [
"ahash", "ahash",
"arboard", "arboard",
@ -1485,7 +1485,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_extras" name = "egui_extras"
version = "0.28.1" 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 = [ dependencies = [
"ahash", "ahash",
"egui", "egui",
@ -1503,7 +1503,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.28.1" 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 = [ dependencies = [
"bytemuck", "bytemuck",
] ]
@ -1632,7 +1632,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.28.1" 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 = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
@ -1648,7 +1648,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint_default_fonts" name = "epaint_default_fonts"
version = "0.28.1" 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]] [[package]]
name = "equivalent" name = "equivalent"

2
Cargo.toml
View File

@ -50,7 +50,7 @@ tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
naga = { version = "22.1.0", features = ["wgsl-out"] } naga = { version = "22.1.0", features = ["wgsl-out"] }
wgpu = "22.1.0" 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"] } clap = { version = "4.5.17", features = ["derive"] }
cpal = "0.15.3" cpal = "0.15.3"
anyhow = "1.0" anyhow = "1.0"

2
core/Cargo.toml
View File

@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
scopeguard = "1.2.0" scopeguard = "1.2.0"
fluent-templates = "0.10.1" fluent-templates = "0.10.1"
egui = { workspace = true, optional = true } 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 } png = { version = "0.17.13", optional = true }
flv-rs = { path = "../flv" } flv-rs = { path = "../flv" }
async-channel = { workspace = true } async-channel = { workspace = true }

6
desktop/Cargo.toml
View File

@ -14,10 +14,10 @@ workspace = true
clap = { workspace = true } clap = { workspace = true }
cpal = { workspace = true } cpal = { workspace = true }
egui = { workspace = true } egui = { workspace = true }
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "f4697bc007447c6c2674beb4e25f599fb7afa093", default-features = false, features = ["image"] } 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 = "f4697bc007447c6c2674beb4e25f599fb7afa093", features = ["winit"] } egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "e0f0b7f47f4094967530214aec060b9f1ce5954e", features = ["winit"] }
image = { workspace = true, features = ["png"] } 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" fontdb = "0.22"
ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] } ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] }
ruffle_render = { path = "../render", features = ["clap"] } ruffle_render = { path = "../render", features = ["clap"] }

2
desktop/src/gui/dialogs/open_dialog.rs
View File

@ -525,7 +525,7 @@ impl OpenDialog {
ui.add_sized( ui.add_sized(
ui.available_size(), ui.available_size(),
Slider::new(&mut self.framerate, 0.0..=100.0) Slider::new(&mut self.framerate, 0.0..=100.0)
.clamp_to_range(false) .clamping(egui::SliderClamping::Never)
.suffix(text(locale, "custom-framerate-suffix")), .suffix(text(locale, "custom-framerate-suffix")),
); );
}); });

6
desktop/src/gui/theme.rs
View File

@ -137,9 +137,9 @@ impl ThemeController {
} }
fn set_theme_internal(&self, data: MutexGuard<'_, ThemeControllerData>, theme: Theme) { fn set_theme_internal(&self, data: MutexGuard<'_, ThemeControllerData>, theme: Theme) {
data.egui_ctx.set_visuals(match theme { data.egui_ctx.set_theme(match theme {
Theme::Light => egui::Visuals::light(), Theme::Light => egui::Theme::Light,
Theme::Dark => egui::Visuals::dark(), Theme::Dark => egui::Theme::Dark,
}); });
if let Some(window) = data.window.upgrade() { if let Some(window) = data.window.upgrade() {
window.request_redraw(); window.request_redraw();