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

Fixes after update

Browse Source
This commit is contained in:
lucasmerlin
2025-06-16 10:05:10 +02:00
parent b85a1d95bc
commit 3c39dee7f0
2 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/egui/src/atomics/atom_layout.rs
View File

@@ -255,11 +255,12 @@ impl<'a> AtomLayout<'a> {
let desired_size = Vec2::new(desired_width, height); let desired_size = Vec2::new(desired_width, height);
let frame_size = (desired_size + margin.sum()).at_least(min_size); let frame_size = (desired_size + margin.sum()).at_least(min_size);
let (_, rect) = ui.allocate_space(frame_size); let intrinsic_size =
(Vec2::new(preferred_width, preferred_height) + margin.sum()).at_least(min_size);
let (_, rect) = ui.allocate_space(frame_size, intrinsic_size);
let mut response = ui.interact(rect, id, sense); let mut response = ui.interact(rect, id, sense);
response.intrinsic_size = response.intrinsic_size = Some(intrinsic_size);
Some((Vec2::new(preferred_width, preferred_height) + margin.sum()).at_least(min_size));
AllocatedAtomLayout { AllocatedAtomLayout {
sized_atoms: sized_items, sized_atoms: sized_items,

9
crates/egui_demo_lib/src/demo/popups.rs
View File

@@ -42,12 +42,13 @@ impl PopupsDemo {
let _ = ui.button("Item"); let _ = ui.button("Item");
ui.menu_button("Recursive", |ui| self.nested_menus(ui)); ui.menu_button("Recursive", |ui| self.nested_menus(ui));
// if ui.button(if *checked { "short" } else { "Very long text for this item that should be wrapped" }).clicked() { // if ui.button(if self.checked { "short" } else { "Very long text for this item that should be wrapped" }).clicked() {
// *checked = !*checked; // self.checked = !self.checked;
// } // }
let checked = self.checked;
ui.checkbox( ui.checkbox(
checked, &mut self.checked,
if *checked { if checked {
"short" "short"
} else { } else {
"Very long text for this item that should be wrapped" "Very long text for this item that should be wrapped"