Skip to content

Commit

Permalink
Better refactor that actually works
Browse files Browse the repository at this point in the history
  • Loading branch information
@emilk
emilk committed Dec 28, 2024
1 parent 27b4ac8 commit 745bfef
Showing 1 changed file with 128 additions and 90 deletions.
218 changes: 128 additions & 90 deletions crates/egui_demo_lib/src/demo/demo_app_windows.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,17 @@ use crate::View;

// ----------------------------------------------------------------------------

#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
struct DemoGroup {
#[cfg_attr(feature = "serde", serde(skip))]
demos: Vec<Box<dyn Demo>>,

open: BTreeSet<String>,
}

impl DemoGroup {
pub fn new(demos: Vec<Box<dyn Demo>>) -> Self {
Self {
demos,
open: Default::default(),
}
Self { demos }
}

#[allow(clippy::needless_pass_by_value)]
pub fn set_open(&mut self, demo: impl Demo + 'static, is_open: bool) {
set_open(&mut self.open, demo.name(), is_open);
}

pub fn checkboxes(&mut self, ui: &mut Ui) {
let Self { demos, open } = self;
pub fn checkboxes(&mut self, ui: &mut Ui, open: &mut BTreeSet<String>) {
let Self { demos } = self;
for demo in demos {
if demo.is_enabled(ui.ctx()) {
let mut is_open = open.contains(demo.name());
Expand All @@ -41,8 +29,8 @@ impl DemoGroup {
}
}

pub fn windows(&mut self, ctx: &Context) {
let Self { demos, open } = self;
pub fn windows(&mut self, ctx: &Context, open: &mut BTreeSet<String>) {
let Self { demos } = self;
for demo in demos {
let mut is_open = open.contains(demo.name());
demo.show(ctx, &mut is_open);
Expand All @@ -63,71 +51,128 @@ fn set_open(open: &mut BTreeSet<String>, key: &'static str, is_open: bool) {

// ----------------------------------------------------------------------------

pub struct DemoGroups {
about: About,
demos: DemoGroup,
tests: DemoGroup,
}

impl Default for DemoGroups {
fn default() -> Self {
Self {
about: About::default(),
demos: DemoGroup::new(vec![
Box::<super::paint_bezier::PaintBezier>::default(),
Box::<super::code_editor::CodeEditor>::default(),
Box::<super::code_example::CodeExample>::default(),
Box::<super::context_menu::ContextMenus>::default(),
Box::<super::dancing_strings::DancingStrings>::default(),
Box::<super::drag_and_drop::DragAndDropDemo>::default(),
Box::<super::extra_viewport::ExtraViewport>::default(),
Box::<super::font_book::FontBook>::default(),
Box::<super::frame_demo::FrameDemo>::default(),
Box::<super::highlighting::Highlighting>::default(),
Box::<super::interactive_container::InteractiveContainerDemo>::default(),
Box::<super::MiscDemoWindow>::default(),
Box::<super::modals::Modals>::default(),
Box::<super::multi_touch::MultiTouch>::default(),
Box::<super::painting::Painting>::default(),
Box::<super::pan_zoom::PanZoom>::default(),
Box::<super::panels::Panels>::default(),
Box::<super::screenshot::Screenshot>::default(),
Box::<super::scrolling::Scrolling>::default(),
Box::<super::sliders::Sliders>::default(),
Box::<super::strip_demo::StripDemo>::default(),
Box::<super::table_demo::TableDemo>::default(),
Box::<super::text_edit::TextEditDemo>::default(),
Box::<super::text_layout::TextLayoutDemo>::default(),
Box::<super::tooltips::Tooltips>::default(),
Box::<super::undo_redo::UndoRedoDemo>::default(),
Box::<super::widget_gallery::WidgetGallery>::default(),
Box::<super::window_options::WindowOptions>::default(),
]),
tests: DemoGroup::new(vec![
Box::<super::tests::CursorTest>::default(),
Box::<super::tests::GridTest>::default(),
Box::<super::tests::IdTest>::default(),
Box::<super::tests::InputEventHistory>::default(),
Box::<super::tests::InputTest>::default(),
Box::<super::tests::LayoutTest>::default(),
Box::<super::tests::ManualLayoutTest>::default(),
Box::<super::tests::WindowResizeTest>::default(),
]),
}
}
}

impl DemoGroups {
pub fn checkboxes(&mut self, ui: &mut Ui, open: &mut BTreeSet<String>) {
let Self {
about,
demos,
tests,
} = self;

{
let mut is_open = open.contains(about.name());
ui.toggle_value(&mut is_open, about.name());
set_open(open, about.name(), is_open);
}
ui.separator();
demos.checkboxes(ui, open);
ui.separator();
tests.checkboxes(ui, open);
}

pub fn windows(&mut self, ctx: &Context, open: &mut BTreeSet<String>) {
let Self {
about,
demos,
tests,
} = self;
{
let mut is_open = open.contains(about.name());
about.show(ctx, &mut is_open);
set_open(open, about.name(), is_open);
}
demos.windows(ctx, open);
tests.windows(ctx, open);
}
}

// ----------------------------------------------------------------------------

/// A menu bar in which you can select different demo windows to show.
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[cfg_attr(feature = "serde", serde(default))]
pub struct DemoWindows {
about_is_open: bool,
about: About,
demos: DemoGroup,
tests: DemoGroup,
#[cfg_attr(feature = "serde", serde(skip))]
groups: DemoGroups,

open: BTreeSet<String>,
}

impl Default for DemoWindows {
fn default() -> Self {
let mut demos = DemoGroup::new(vec![
Box::<super::paint_bezier::PaintBezier>::default(),
Box::<super::code_editor::CodeEditor>::default(),
Box::<super::code_example::CodeExample>::default(),
Box::<super::context_menu::ContextMenus>::default(),
Box::<super::dancing_strings::DancingStrings>::default(),
Box::<super::drag_and_drop::DragAndDropDemo>::default(),
Box::<super::extra_viewport::ExtraViewport>::default(),
Box::<super::font_book::FontBook>::default(),
Box::<super::frame_demo::FrameDemo>::default(),
Box::<super::highlighting::Highlighting>::default(),
Box::<super::interactive_container::InteractiveContainerDemo>::default(),
Box::<super::MiscDemoWindow>::default(),
Box::<super::modals::Modals>::default(),
Box::<super::multi_touch::MultiTouch>::default(),
Box::<super::painting::Painting>::default(),
Box::<super::pan_zoom::PanZoom>::default(),
Box::<super::panels::Panels>::default(),
Box::<super::screenshot::Screenshot>::default(),
Box::<super::scrolling::Scrolling>::default(),
Box::<super::sliders::Sliders>::default(),
Box::<super::strip_demo::StripDemo>::default(),
Box::<super::table_demo::TableDemo>::default(),
Box::<super::text_edit::TextEditDemo>::default(),
Box::<super::text_layout::TextLayoutDemo>::default(),
Box::<super::tooltips::Tooltips>::default(),
Box::<super::undo_redo::UndoRedoDemo>::default(),
Box::<super::widget_gallery::WidgetGallery>::default(),
Box::<super::window_options::WindowOptions>::default(),
]);
let mut open = BTreeSet::new();

// Explains egui very well
demos.set_open(super::code_example::CodeExample::default(), true);
set_open(
&mut open,
super::code_example::CodeExample::default().name(),
true,
);

// Shows off the features
demos.set_open(super::widget_gallery::WidgetGallery::default(), true);

let tests = DemoGroup::new(vec![
Box::<super::tests::CursorTest>::default(),
Box::<super::tests::GridTest>::default(),
Box::<super::tests::IdTest>::default(),
Box::<super::tests::InputEventHistory>::default(),
Box::<super::tests::InputTest>::default(),
Box::<super::tests::LayoutTest>::default(),
Box::<super::tests::ManualLayoutTest>::default(),
Box::<super::tests::WindowResizeTest>::default(),
]);
set_open(
&mut open,
super::widget_gallery::WidgetGallery::default().name(),
true,
);

Self {
about_is_open: true,
about: Default::default(),
demos,
tests,
groups: Default::default(),
open,
}
}
}
Expand All @@ -142,14 +187,18 @@ impl DemoWindows {
}
}

fn about_is_open(&self) -> bool {
self.open.contains(About::default().name())
}

fn mobile_ui(&mut self, ctx: &Context) {
if self.about_is_open {
if self.about_is_open() {
let mut close = false;
egui::CentralPanel::default().show(ctx, |ui| {
egui::ScrollArea::vertical()
.auto_shrink(false)
.show(ui, |ui| {
self.about.ui(ui);
self.groups.about.ui(ui);
ui.add_space(12.0);
ui.vertical_centered_justified(|ui| {
if ui
Expand All @@ -161,10 +210,12 @@ impl DemoWindows {
});
});
});
self.about_is_open &= !close;
if close {
set_open(&mut self.open, About::default().name(), false);
}
} else {
self.mobile_top_bar(ctx);
self.show_windows(ctx);
self.groups.windows(ctx, &mut self.open);
}
}

Expand Down Expand Up @@ -230,27 +281,14 @@ impl DemoWindows {
});
});

self.show_windows(ctx);
}

/// Show the open windows.
fn show_windows(&mut self, ctx: &Context) {
self.about.show(ctx, &mut self.about_is_open);
self.demos.windows(ctx);
self.tests.windows(ctx);
self.groups.windows(ctx, &mut self.open);
}

fn demo_list_ui(&mut self, ui: &mut egui::Ui) {
ScrollArea::vertical().show(ui, |ui| {
ui.with_layout(egui::Layout::top_down_justified(egui::Align::LEFT), |ui| {
ui.toggle_value(&mut self.about_is_open, self.about.name());

self.groups.checkboxes(ui, &mut self.open);
ui.separator();
self.demos.checkboxes(ui);
ui.separator();
self.tests.checkboxes(ui);
ui.separator();

if ui.button("Organize windows").clicked() {
ui.ctx().memory_mut(|mem| mem.reset_areas());
}
Expand Down Expand Up @@ -320,18 +358,18 @@ fn file_menu_button(ui: &mut Ui) {

#[cfg(test)]
mod tests {
use crate::{demo::demo_app_windows::DemoWindows, Demo};
use crate::{demo::demo_app_windows::DemoGroups, Demo};
use egui::Vec2;
use egui_kittest::kittest::Queryable;
use egui_kittest::{Harness, SnapshotOptions};

#[test]
fn demos_should_match_snapshot() {
let demos = DemoWindows::default();
let demos = DemoGroups::default().demos;

let mut errors = Vec::new();

for mut demo in demos.demos.demos {
for mut demo in demos.demos {
// Remove the emoji from the demo name
let name = demo
.name()
Expand Down

0 comments on commit 745bfef

Please sign in to comment.