djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: custom Ui:s now allocate minimal space in parent ui.

Browse source 
This makes nested horizontal/vertical layouts work better
This commit is contained in:
Emil Ernerfeldt 2021-04-02 22:39:08 +02:00
parent 4ac5b37702
commit ebb08f87f1
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
egui/src/ui.rs
View file

@ -706,11 +706,10 @@ impl Ui {
let ret = add_contents(&mut child_ui); let ret = add_contents(&mut child_ui);
let final_child_rect = child_ui.min_rect(); let final_child_rect = child_ui.min_rect();
let final_frame = frame_rect.union(final_child_rect);
self.placer self.placer
.advance_after_rects(final_frame, final_child_rect, item_spacing); .advance_after_rects(final_child_rect, final_child_rect, item_spacing);
if self.style().debug.show_widgets && self.rect_contains_pointer(final_frame) { if self.style().debug.show_widgets && self.rect_contains_pointer(final_child_rect) {
let painter = self.ctx().debug_painter(); let painter = self.ctx().debug_painter();
painter.rect_stroke(frame_rect, 4.0, (1.0, Color32::LIGHT_BLUE)); painter.rect_stroke(frame_rect, 4.0, (1.0, Color32::LIGHT_BLUE));
painter.rect_stroke(final_child_rect, 4.0, (1.0, Color32::LIGHT_BLUE)); painter.rect_stroke(final_child_rect, 4.0, (1.0, Color32::LIGHT_BLUE));
@ -1344,9 +1343,7 @@ impl Ui {
} }
.with_main_wrap(main_wrap); .with_main_wrap(main_wrap);
self.allocate_ui(initial_size, |ui| { self.allocate_ui_with_layout(initial_size, layout, add_contents)
ui.with_layout(layout, add_contents).inner
})
} }
/// Start a ui with vertical layout. /// Start a ui with vertical layout.