migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Make it more clear how a Ui Id was derived

Browse Source
This commit is contained in:
lucasmerlin
2026-03-18 16:55:07 +01:00
parent bbf5e2d728
commit 2feb5a7800
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/egui/src/ui.rs
View File

@@ -153,7 +153,7 @@ impl Ui {
let mut ui = Ui { let mut ui = Ui {
id, id,
unique_id: id, unique_id: id,
next_auto_id_salt: id.with("auto").value(), next_auto_id_salt: 0,
painter: Painter::new(ctx, layer_id, clip_rect), painter: Painter::new(ctx, layer_id, clip_rect),
style, style,
placer, placer,
@@ -295,12 +295,10 @@ impl Ui {
(id_salt, id_salt) (id_salt, id_salt)
} else { } else {
let stable_id = self.id.with(id_salt); let stable_id = self.id.with(id_salt);
let unique_id = stable_id.with(self.next_auto_id_salt); let unique_id = self.unique_id.with(id_salt).with(self.next_auto_id_salt);
(stable_id, unique_id) (stable_id, unique_id)
}; };
let next_auto_id_salt = unique_id.value().wrapping_add(1);
self.next_auto_id_salt = self.next_auto_id_salt.wrapping_add(1); self.next_auto_id_salt = self.next_auto_id_salt.wrapping_add(1);
let placer = Placer::new(max_rect, layout); let placer = Placer::new(max_rect, layout);
@@ -315,7 +313,7 @@ impl Ui {
let mut child_ui = Ui { let mut child_ui = Ui {
id: stable_id, id: stable_id,
unique_id, unique_id,
next_auto_id_salt, next_auto_id_salt: 0,
painter, painter,
style, style,
placer, placer,
@@ -1007,22 +1005,33 @@ impl Ui {
} }
/// This is the `Id` that will be assigned to the next widget added to this `Ui`. /// This is the `Id` that will be assigned to the next widget added to this `Ui`.
#[inline]
pub fn next_auto_id(&self) -> Id { pub fn next_auto_id(&self) -> Id {
Id::new(self.next_auto_id_salt) self.unique_id.with(self.next_auto_id_salt)
} }
/// Same as `ui.next_auto_id().with(id_salt)` /// Same as `ui.next_auto_id().with(id_salt)`
#[inline]
pub fn auto_id_with<IdSource>(&self, id_salt: IdSource) -> Id pub fn auto_id_with<IdSource>(&self, id_salt: IdSource) -> Id
where where
IdSource: AsId, IdSource: AsId,
{ {
Id::new(self.next_auto_id_salt).with(id_salt) self.next_auto_id().with(id_salt)
} }
/// Pretend like `count` widgets have been allocated. /// Pretend like `count` widgets have been allocated.
#[inline]
pub fn skip_ahead_auto_ids(&mut self, count: usize) { pub fn skip_ahead_auto_ids(&mut self, count: usize) {
self.next_auto_id_salt = self.next_auto_id_salt.wrapping_add(count as u64); self.next_auto_id_salt = self.next_auto_id_salt.wrapping_add(count as u64);
} }
/// Get auto id and advance auto id counter by 1.
#[inline]
pub fn get_auto_id(&mut self) -> Id {
let id = self.next_auto_id();
self.skip_ahead_auto_ids(1);
id
}
} }
/// # Interaction /// # Interaction
@@ -1372,8 +1381,7 @@ impl Ui {
} }
} }
let id = Id::new(self.next_auto_id_salt); let id = self.get_auto_id();
self.next_auto_id_salt = self.next_auto_id_salt.wrapping_add(1);
(id, rect) (id, rect)
} }
@@ -1413,9 +1421,7 @@ impl Ui {
self.placer.advance_after_rects(rect, rect, item_spacing); self.placer.advance_after_rects(rect, rect, item_spacing);
register_rect(self, rect); register_rect(self, rect);
let id = Id::new(self.next_auto_id_salt); self.get_auto_id()
self.next_auto_id_salt = self.next_auto_id_salt.wrapping_add(1);
id
} }
pub(crate) fn placer(&self) -> &Placer { pub(crate) fn placer(&self) -> &Placer {