desktop: Show ruffle logo in about dialog

This commit is contained in:
Nathan Adams 2023-11-12 01:02:38 +01:00
parent 576c7e1b14
commit 424821724f
5 changed files with 90 additions and 6 deletions

84
Cargo.lock generated
View File

@ -416,6 +416,12 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
[[package]]
name = "bit_field"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]]
name = "bitflags"
version = "1.3.2"
@ -970,6 +976,12 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-common"
version = "0.1.6"
@ -1355,6 +1367,7 @@ checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07"
dependencies = [
"egui",
"enum-map",
"image",
"log",
"mime_guess",
"serde",
@ -1544,6 +1557,22 @@ dependencies = [
"walkdir",
]
[[package]]
name = "exr"
version = "1.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
dependencies = [
"bit_field",
"flume 0.11.0",
"half",
"lebe",
"miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
]
[[package]]
name = "fastrand"
version = "1.9.0"
@ -1657,7 +1686,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dec7592cd1f45c1afe9084ce59c62a3a7c266c125c4c2ec97e95b0563c4aa914"
dependencies = [
"flume",
"flume 0.10.14",
"ignore",
"once_cell",
"proc-macro2",
@ -1678,7 +1707,7 @@ dependencies = [
"fluent-langneg",
"fluent-syntax",
"fluent-template-macros",
"flume",
"flume 0.10.14",
"heck",
"ignore",
"intl-memoizer",
@ -1699,6 +1728,15 @@ dependencies = [
"spin",
]
[[package]]
name = "flume"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
dependencies = [
"spin",
]
[[package]]
name = "flv-rs"
version = "0.1.0"
@ -2207,6 +2245,15 @@ dependencies = [
"wide",
]
[[package]]
name = "half"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
dependencies = [
"crunchy",
]
[[package]]
name = "hashbrown"
version = "0.12.3"
@ -2362,9 +2409,13 @@ dependencies = [
"bytemuck",
"byteorder",
"color_quant",
"exr",
"gif",
"jpeg-decoder",
"num-rational",
"num-traits",
"png",
"qoi",
"tiff",
]
@ -2575,6 +2626,9 @@ name = "jpeg-decoder"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
dependencies = [
"rayon",
]
[[package]]
name = "jpegxr"
@ -2619,6 +2673,12 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lebe"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libc"
version = "0.2.149"
@ -3770,6 +3830,15 @@ dependencies = [
"syn 2.0.38",
]
[[package]]
name = "qoi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
dependencies = [
"bytemuck",
]
[[package]]
name = "quick-xml"
version = "0.31.0"
@ -4089,12 +4158,14 @@ dependencies = [
"egui",
"egui-wgpu",
"egui-winit",
"egui_extras",
"embed-resource",
"fluent-templates",
"fontdb",
"futures",
"futures-lite",
"generational-arena",
"image",
"isahc",
"os_info",
"rfd",
@ -6157,3 +6228,12 @@ dependencies = [
"quote",
"syn 2.0.38",
]
[[package]]
name = "zune-inflate"
version = "0.2.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
dependencies = [
"simd-adler32",
]

View File

@ -11,7 +11,9 @@ version.workspace = true
clap = { version = "4.4.7", features = ["derive"] }
cpal = "0.15.2"
egui = { workspace = true }
egui_extras = { version = "0.23.0", features = ["image"] }
egui-wgpu = { version = "0.23.0", features = ["winit"] }
image = { version = "0.24", features = ["png"] }
egui-winit = "0.23.0"
fontdb = "0.16"
ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui", "default_font"] }

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -334,10 +334,9 @@ impl RuffleGui {
.open(&mut self.is_about_visible)
.show(egui_ctx, |ui| {
ui.vertical_centered(|ui| {
ui.label(
RichText::new("Ruffle")
.color(Color32::from_rgb(0xFF, 0xAD, 0x33))
.size(32.0),
ui.add(
Image::new(egui::include_image!("../assets/about_logo.png"))
.max_width(350.0),
);
Grid::new("about_ruffle_version_info")
.striped(true)

View File

@ -107,6 +107,9 @@ impl GuiController {
let gui = RuffleGui::new(event_loop, opt.movie_url.clone(), PlayerOptions::from(opt));
let system_fonts = load_system_fonts(gui.locale.to_owned()).unwrap_or_default();
egui_ctx.set_fonts(system_fonts);
egui_extras::install_image_loaders(&egui_ctx);
Ok(Self {
descriptors: Arc::new(descriptors),
egui_ctx,