skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge race

This commit is contained in:
Emil Ernerfeldt 2024-09-19 12:01:10 +02:00
parent 902c54e534
commit b1784249d2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1023,9 +1023,9 @@ impl Ui {
/// It's [`Sense`] will be based on the [`UiBuilder::sense`] used to create this [`Ui`]. /// It's [`Sense`] will be based on the [`UiBuilder::sense`] used to create this [`Ui`].
/// ///
/// The rectangle of the [`Response`] (and interactive area) will be [`Self::min_rect`] /// The rectangle of the [`Response`] (and interactive area) will be [`Self::min_rect`]
/// of the last frame. /// of the last pass.
/// ///
/// On the first frame, when the [`Ui`] is created, this will return a [`Response`] with a /// The very first time when the [`Ui`] is created, this will return a [`Response`] with a
/// [`Rect`] of [`Rect::NOTHING`]. /// [`Rect`] of [`Rect::NOTHING`].
pub fn response(&self) -> Response { pub fn response(&self) -> Response {
// This is the inverse of Context::read_response. We prefer a response // This is the inverse of Context::read_response. We prefer a response
@ -1034,10 +1034,10 @@ impl Ui {
self.ctx() self.ctx()
.viewport(|viewport| { .viewport(|viewport| {
viewport viewport
.prev_frame .prev_pass
.widgets .widgets
.get(self.id) .get(self.id)
.or_else(|| viewport.this_frame.widgets.get(self.id)) .or_else(|| viewport.this_pass.widgets.get(self.id))
.copied() .copied()
}) })
.map(|widget_rect| self.ctx().get_response(widget_rect)) .map(|widget_rect| self.ctx().get_response(widget_rect))
@ -1053,7 +1053,7 @@ impl Ui {
// We remove the id from used_ids to prevent a duplicate id warning from showing // We remove the id from used_ids to prevent a duplicate id warning from showing
// when the ui was created with `UiBuilder::sense`. // when the ui was created with `UiBuilder::sense`.
// This is a bit hacky, is there a better way? // This is a bit hacky, is there a better way?
self.ctx().frame_state_mut(|fs| { self.ctx().pass_state_mut(|fs| {
fs.used_ids.remove(&self.id); fs.used_ids.remove(&self.id);
}); });
// This will update the WidgetRect that was first created in `Ui::new`. // This will update the WidgetRect that was first created in `Ui::new`.