Skip to content

Fix new move_to_top flag breaking widget order #7825

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

Merged
emilk merged 3 commits into from
Jan 5, 2026
+13 −0
Merged

Fix new move_to_top flag breaking widget order #7825

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
362267d
Fix new move_to_top flag breaking widget order
lucasmerlin Jan 2, 2026
d8ff9be
Clippy
lucasmerlin Jan 2, 2026
a280bb0
Don't -1
lucasmerlin Jan 2, 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
13 changes: 13 additions & 0 deletions crates/egui/src/widget_rect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ impl WidgetRects {

let InteractOptions { move_to_top } = options;

let mut shift_layer_index_after = None;

let layer_widgets = by_layer.entry(layer_id).or_default();

match by_id.entry(widget_rect.id) {
Expand All @@ -187,6 +189,7 @@ impl WidgetRects {
if existing.layer_id == widget_rect.layer_id {
if move_to_top {
layer_widgets.remove(*idx_in_layer);
shift_layer_index_after = Some(*idx_in_layer);
*idx_in_layer = layer_widgets.len();
layer_widgets.push(*existing);
} else {
Expand All @@ -200,6 +203,16 @@ impl WidgetRects {
}
}
}

if let Some(shift_start) = shift_layer_index_after {
#[expect(clippy::needless_range_loop)]
for i in shift_start..layer_widgets.len() {
let w = &layer_widgets[i];
if let Some((idx_in_by_id, _)) = by_id.get_mut(&w.id) {
*idx_in_by_id = i;
}
}
}
}

pub fn set_info(&mut self, id: Id, info: WidgetInfo) {
Expand Down