Skip to content

desktop: Bump egui to 0.37 #24954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
torokati44 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

desktop: Bump egui to 0.37 #24954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67a074b
desktop: Bump egui to 0.37
torokati44 Oct 18, 2026
371c357
desktop: Bundle default fonts for egui again
torokati44 Oct 18, 2026
f445210
desktop: Fix layout of "Open" dialog with "Player Settings" expanded
torokati44 Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 140 additions & 39 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
naga = { version = "30.0.1", features = ["wgsl-out"] }
wgpu = "30.0.1"
wgpu-profiler = "0.28.0"
egui = "0.36.1"
egui_extras = { version = "0.36.1", default-features = false }
egui-wgpu = "0.36.1"
egui-winit = "0.36.1"
egui = "0.37.0"
egui_extras = { version = "0.37.0", default-features = false }
egui-wgpu = "0.37.0"
egui-winit = "0.37.0"
clap = { version = "4.6.1", features = ["derive"] }
clap_complete = "4.6"
cpal = "0.16.0"
Expand Down
6 changes: 3 additions & 3 deletions core/src/debug_ui/avm1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl Avm1ObjectWindow {
let mut activation =
Activation::from_nothing(context, ActivationIdentifier::root("Debug"), base_clip);
Window::new(object_name(object))
.id(Id::new(object.as_ptr()))
.id(Id::unique(object.as_ptr()))
.open(&mut keep_open)
.scroll([true, true])
.show(egui_ctx, |ui| {
Expand Down Expand Up @@ -81,7 +81,7 @@ impl Avm1ObjectWindow {
activation: &mut Activation<'_, 'gc>,
messages: &mut Vec<Message>,
) {
Grid::new(ui.id().with("properties"))
Grid::new(ui.scope_id().with("properties"))
.num_columns(2)
.show(ui, |ui| {
let mut keys = object.get_keys(activation, true);
Expand Down Expand Up @@ -273,7 +273,7 @@ fn show_value_type_combo_box<'gc>(
mutation: &Mutation<'gc>,
) -> Option<Value<'gc>> {
let mut new = None;
egui::ComboBox::new(egui::Id::new("value_combo").with(key), "Type")
egui::ComboBox::new(("value_combo", key), "Type")
.selected_text(value_label(value))
.show_ui(ui, |ui| {
if ui
Expand Down
6 changes: 3 additions & 3 deletions core/src/debug_ui/avm2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ impl Avm2ObjectWindow {
let domain = context.avm2.stage_domain();
let mut activation = Activation::from_domain(context, domain);
Window::new(object_name(activation.gc(), object))
.id(Id::new(object.as_ptr()))
.id(Id::unique(object.as_ptr()))
.open(&mut keep_open)
.scroll([true, true])
.show(egui_ctx, |ui| {
Expand Down Expand Up @@ -105,7 +105,7 @@ impl Avm2ObjectWindow {
activation: &mut Activation<'_, 'gc>,
ui: &mut Ui,
) {
Grid::new(ui.id().with("info"))
Grid::new(ui.scope_id().with("info"))
.num_columns(2)
.striped(true)
.show(ui, |ui| {
Expand Down Expand Up @@ -242,7 +242,7 @@ impl Avm2ObjectWindow {
context: &mut UpdateContext<'gc>,
ui: &mut Ui,
) {
Grid::new(ui.id().with("class"))
Grid::new(ui.scope_id().with("class"))
.num_columns(2)
.striped(true)
.spacing([8.0, 8.0])
Expand Down
6 changes: 3 additions & 3 deletions core/src/debug_ui/avm2_class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl Avm2ClassWindow {
) -> bool {
let mut keep_open = true;
Window::new(class_name(context.gc(), class))
.id(Id::new(class.as_ptr()))
.id(Id::unique(class.as_ptr()))
.open(&mut keep_open)
.scroll([true, true])
.show(egui_ctx, |ui| {
Expand Down Expand Up @@ -57,7 +57,7 @@ impl Avm2ClassWindow {
context: &mut UpdateContext<'gc>,
ui: &mut Ui,
) {
Grid::new(ui.id().with("class"))
Grid::new(ui.scope_id().with("class"))
.num_columns(2)
.striped(true)
.spacing([8.0, 8.0])
Expand Down Expand Up @@ -104,7 +104,7 @@ impl Avm2ClassWindow {
context: &mut UpdateContext<'gc>,
ui: &mut Ui,
) {
Grid::new(ui.id().with("class"))
Grid::new(ui.scope_id().with("class"))
.num_columns(2)
.striped(true)
.spacing([8.0, 8.0])
Expand Down
4 changes: 2 additions & 2 deletions core/src/debug_ui/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::html::{StyleSheet, TextFormat};
use egui::{CollapsingHeader, Grid, Ui};

pub fn show_text_format(ui: &mut Ui, tf: &TextFormat, skip_none: bool) {
Grid::new(ui.id().with("text_format_table"))
Grid::new(ui.scope_id().with("text_format_table"))
.num_columns(2)
.striped(true)
.show(ui, |ui| {
Expand Down Expand Up @@ -51,7 +51,7 @@ pub fn show_style_sheet(ui: &mut Ui, style_sheet: StyleSheet<'_>) {
selectors.sort();
for selector in selectors {
CollapsingHeader::new(selector.to_utf8_lossy())
.id_salt(ui.id().with(selector.to_utf8_lossy()))
.id_salt(ui.scope_id().with(selector.to_utf8_lossy()))
.show(ui, |ui| {
if let Some(tf) = style_sheet.get_style(&selector) {
show_text_format(ui, &tf, true);
Expand Down
Loading
Loading