diff --git a/Cargo.lock b/Cargo.lock index 3a12dee..4365c23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1223,7 +1223,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecolor" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "bytemuck", "color-hex", @@ -1233,7 +1233,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "ahash", "bytemuck", @@ -1267,7 +1267,7 @@ dependencies = [ [[package]] name = "egui" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "accesskit", "ahash", @@ -1280,7 +1280,7 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "ahash", "bytemuck", @@ -1298,7 +1298,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "accesskit_winit", "ahash", @@ -1366,7 +1366,7 @@ dependencies = [ [[package]] name = "egui_extras" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "ahash", "egui", @@ -1399,7 +1399,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "ahash", "bytemuck", @@ -1564,7 +1564,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "bytemuck", ] @@ -1623,7 +1623,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" dependencies = [ "ab_glyph", "ahash", @@ -1639,7 +1639,7 @@ dependencies = [ [[package]] name = "epaint_default_fonts" version = "0.28.1" -source = "git+https://github.com/emilk/egui?branch=master#5cc35d22127be4dbe58c2f7f80340c3d041094e9" +source = "git+https://github.com/emilk/egui?branch=master#06f709481a4e5e74bec961544c77e9afcae265db" [[package]] name = "equivalent" diff --git a/crates/egui_flex/src/lib.rs b/crates/egui_flex/src/lib.rs index 4752b53..eec0148 100644 --- a/crates/egui_flex/src/lib.rs +++ b/crates/egui_flex/src/lib.rs @@ -268,7 +268,10 @@ impl Flex { // } // } // } - instance.ui.ctx().request_discard(); + instance + .ui + .ctx() + .request_discard("Flex item added / removed / size changed"); instance.ui.ctx().request_repaint(); } @@ -892,7 +895,7 @@ impl FlexContainerUi { let available_size = ui.available_size(); let response = if self.remeasure_widget { - ui.ctx().request_discard(); + ui.ctx().request_discard("Flex item remeasure"); let mut child_ui = ui.new_child(UiBuilder::new().max_rect(self.content_rect)); child_ui.set_invisible(); let response = child_ui.centered_and_justified(|ui| widget.ui(ui)).inner; @@ -923,7 +926,7 @@ impl FlexContainerUi { if remeasure_widget { ui.ctx().request_repaint(); - ui.ctx().request_discard(); + ui.ctx().request_discard("Triggering flex item remeasure"); // dbg!(available_size); // dbg!(intrinsic_size.round(), self.last_inner_size);