Skip to content

Commit

Permalink
Simplify egui_flex by removing add_container and making frame part of…
Browse files Browse the repository at this point in the history 
… FlexItem
  • Loading branch information
@lucasmerlin
lucasmerlin committed Nov 8, 2024
1 parent 3fcc162 commit 60e076a
Show file tree
Hide file tree
Showing 7 changed files with 272 additions and 341 deletions.
5 changes: 2 additions & 3 deletions crates/egui_flex/examples/debug_example.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ fn main() -> eframe::Result {
},
);

flex.add_flex_frame(
FlexItem::default().grow(1.0),
flex.add_flex(
FlexItem::default().grow(1.0).frame(frame),
Flex::vertical()
.align_content(egui_flex::FlexAlignContent::Stretch)
.grow_items(1.0),
frame,
|flex| {
flex.add(
FlexItem::default().grow(1.0),
Expand Down
86 changes: 37 additions & 49 deletions crates/egui_flex/examples/flex_demos.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,9 @@ fn main() -> eframe::Result {
.grow_items(1.0)
.wrap(true)
.show(ui, |flex| {
flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).grow_items(grow_items),
frame,
|flex| {
heading(flex, "Align");

Expand All @@ -97,65 +96,60 @@ fn main() -> eframe::Result {
FlexAlign::End,
FlexAlign::Stretch,
] {
flex.add_ui_frame(
FlexItem::new().align_self(*align),
frame,
flex.add_ui(
FlexItem::new().align_self(*align).frame(frame),
|ui| {
ui.label(format!("{align:?}"));
},
);
}

flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("Some bigger item\nwith some\nmore lines")
});
},
);

flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir),
frame,
|flex| {
heading(flex, "Grow");

for grow in &[0.0, 1.0, 2.0, 3.0] {
flex.add_ui_frame(FlexItem::new().grow(*grow), frame, |ui| {
flex.add_ui(FlexItem::new().grow(*grow).frame(frame), |ui| {
ui.label(format!("{grow:?}"));
});
}
},
);

flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).grow_items(grow_items),
frame,
|flex| {
heading(flex, "Basis");

for basis in &[0.0, 50.0, 100.0, 200.0] {
flex.add_ui_frame(FlexItem::new().basis(*basis), frame, |ui| {
flex.add_ui(FlexItem::new().basis(*basis).frame(frame), |ui| {
ui.label(format!("{basis:?}"));
});
}
},
);

flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).grow_items(grow_items),
frame,
|flex| {
heading(flex, "Justify Content");

flex.add_flex_frame(
item().grow(1.0),
flex.add_flex(
item().grow(1.0).frame(frame),
Flex::new()
.direction(main_dir)
.grow_items(grow_items)
.align_items(FlexAlign::Stretch),
frame,
|flex| {
for justify in &[
FlexJustify::Start,
Expand All @@ -165,10 +159,9 @@ fn main() -> eframe::Result {
FlexJustify::SpaceAround,
FlexJustify::SpaceEvenly,
] {
flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).justify(*justify),
frame,
|flex| {
flex.add(
item(),
Expand All @@ -184,59 +177,54 @@ fn main() -> eframe::Result {
},
);

flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).grow_items(grow_items),
frame,
|flex| {
heading(flex, "Nested");

flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(main_dir).grow_items(grow_items),
frame,
|flex| {
flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("one");
});
flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).grow_items(grow_items),
frame,
|flex| {
flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("two");
});
flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("three");
});
},
);
},
);
flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(main_dir).grow_items(grow_items),
frame,
|flex| {
flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("one");
});
flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("two");
});
flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("three");
});
},
);
},
);

flex.add_flex_frame(
FlexItem::new(),
flex.add_flex(
FlexItem::new().frame(frame),
Flex::new().direction(demo_dir).grow_items(grow_items),
frame,
|flex| {
heading(flex, "Align Self Content");

Expand All @@ -257,18 +245,18 @@ fn main() -> eframe::Result {
FlexAlign::End,
FlexAlign::Stretch,
] {
flex.add_ui_frame(
flex.add_ui(
FlexItem::new()
.align_self(*align)
.align_self_content(align_content),
frame,
.align_self_content(align_content)
.frame(frame),
|ui| {
ui.label(format!("{align:?}"));
},
);
}

flex.add_ui_frame(FlexItem::new(), frame, |ui| {
flex.add_ui(FlexItem::new().frame(frame), |ui| {
ui.label("Some bigger item\nwith some\nmore lines")
});
},
Expand Down
Loading

0 comments on commit 60e076a

Please sign in to comment.