diff --git a/Cargo.lock b/Cargo.lock index bcb36e4f33bc..79c6fb51d35c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1341,7 +1341,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" [[package]] name = "ecolor" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "bytemuck", "emath", @@ -1350,7 +1350,7 @@ dependencies = [ [[package]] name = "egui" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "ahash", "bitflags 2.9.3", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "ahash", "bytemuck", @@ -1385,7 +1385,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "ahash", "arboard", @@ -1403,7 +1403,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "ahash", "egui", @@ -1422,7 +1422,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "emath" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "bytemuck", ] @@ -1550,7 +1550,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" dependencies = [ "ab_glyph", "ahash", @@ -1567,7 +1567,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.31.1" -source = "git+https://github.com/emilk/egui.git?branch=main#78a8de2e8f8d6da82680af4701cfa6e61cfe389c" +source = "git+https://github.com/emilk/egui.git?branch=main#f46926aaf1ea7ab5a3756c678a1d647b9e549bd6" [[package]] name = "equivalent" diff --git a/core/src/debug_ui/avm1.rs b/core/src/debug_ui/avm1.rs index acc7416ecdd8..f25f90cd4f09 100644 --- a/core/src/debug_ui/avm1.rs +++ b/core/src/debug_ui/avm1.rs @@ -315,11 +315,11 @@ fn show_value_type_combo_box<'gc>( // so just disable the selectable labels to prevent setting to these types. ui.add_enabled( false, - egui::SelectableLabel::new(matches!(value, Value::Object(_)), "Object"), + egui::Button::selectable(matches!(value, Value::Object(_)), "Object"), ); ui.add_enabled( false, - egui::SelectableLabel::new(matches!(value, Value::MovieClip(_)), "MovieClip"), + egui::Button::selectable(matches!(value, Value::MovieClip(_)), "MovieClip"), ); }); new diff --git a/desktop/src/gui/controller.rs b/desktop/src/gui/controller.rs index fcf65b8ae16d..b36c51bbe7ec 100644 --- a/desktop/src/gui/controller.rs +++ b/desktop/src/gui/controller.rs @@ -75,12 +75,23 @@ impl GuiController { adapter_info.name, adapter_info.device_type ); - let surface_format = surface - .get_capabilities(&adapter) - .formats - .first() - .cloned() - .expect("At least one format should be supported"); + let preferred_formats = [ + // by egui + wgpu::TextureFormat::Rgba8Unorm, + wgpu::TextureFormat::Bgra8Unorm, + ]; + let supported_formats = surface.get_capabilities(&adapter).formats; + let surface_format = preferred_formats + .iter() + .find(|format| supported_formats.contains(format)) + .copied() + .unwrap_or_else(|| { + supported_formats + .first() + .copied() + .expect("At least one format should be supported") + }); + tracing::info!("Using surface format {:?}", surface_format); let size = window.inner_size(); surface.configure( &device,