More cleanup

crates/egui_demo_lib/src/demo/code_editor.rs

@@ -1,4 +1,5 @@
 // ----------------------------------------------------------------------------
+
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]
 pub struct CodeEditor {
@@ -36,7 +37,7 @@ impl super::Demo for CodeEditor {
 
 impl super::View for CodeEditor {
     fn ui(&mut self, ui: &mut egui::Ui) {
-        let CodeEditor { language, code } = self;
+        let Self { language, code } = self;
 
         ui.horizontal(|ui| {
             ui.set_height(0.0);

crates/egui_demo_lib/src/demo/dancing_strings.rs

@@ -16,7 +16,7 @@ impl super::Demo for DancingStrings {
             .open(open)
             .default_size(vec2(512.0, 256.0))
             .vscroll(false)
-            .show(ctx, |ui| Self::default().ui(ui));
+            .show(ctx, |ui| self.ui(ui));
     }
 }
 

crates/egui_demo_lib/src/demo/demo_app_windows.rs

@@ -1,7 +1,5 @@
 use egui::{Context, Modifiers, ScrollArea, Ui};
 use std::collections::BTreeSet;
-use std::sync::Arc;
-use std::sync::RwLock;
 
 use super::About;
 use super::Demo;
@@ -14,7 +12,7 @@ use crate::is_mobile;
 #[cfg_attr(feature = "serde", serde(default))]
 struct Demos {
     #[cfg_attr(feature = "serde", serde(skip))]
-    demos: Vec<Box<dyn Demo + Sync + Send>>,
+    demos: Vec<Box<dyn Demo>>,
 
     open: BTreeSet<String>,
 }
@@ -47,7 +45,7 @@ impl Default for Demos {
 }
 
 impl Demos {
-    pub fn from_demos(demos: Vec<Box<dyn Demo + Sync + Send>>) -> Self {
+    pub fn from_demos(demos: Vec<Box<dyn Demo>>) -> Self {
         let mut open = BTreeSet::new();
         open.insert(
             super::widget_gallery::WidgetGallery::default()
@@ -151,20 +149,14 @@ fn set_open(open: &mut BTreeSet<String>, key: &'static str, is_open: bool) {
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]
-pub struct DemoWindowsData {
+pub struct DemoWindows {
     about_is_open: bool,
     about: About,
     demos: Demos,
     tests: Tests,
 }
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-#[cfg_attr(feature = "serde", serde(default))]
-#[derive(Clone, Default)]
-pub struct DemoWindows {
-    data: Arc<RwLock<DemoWindowsData>>,
-}
 
-impl Default for DemoWindowsData {
+impl Default for DemoWindows {
     fn default() -> Self {
         Self {
             about_is_open: true,
@@ -186,36 +178,32 @@ impl DemoWindows {
     }
 
     fn mobile_ui(&mut self, ctx: &Context) {
-        let mut about_is_open = self.data.read().unwrap().about_is_open;
+        if self.about_is_open {
-        if about_is_open {
             let screen_size = ctx.input(|i| i.screen_rect.size());
             let default_width = (screen_size.x - 20.0).min(400.0);
 
-            let close = Arc::new(RwLock::new(false));
+            let mut close = false;
-            let close_ = close.clone();
+            egui::Window::new(self.about.name())
-            let clone = self.clone();
-            egui::Window::new(self.data.read().unwrap().about.name())
                 .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
                 .default_width(default_width)
                 .default_height(ctx.available_rect().height() - 46.0)
                 .vscroll(true)
-                .open(&mut about_is_open)
+                .open(&mut self.about_is_open)
                 .resizable(false)
                 .collapsible(false)
                 .show(ctx, |ui| {
-                    let close = close.clone();
+                    self.about.ui(ui);
-                    clone.data.write().unwrap().about.ui(ui);
                     ui.add_space(12.0);
                     ui.vertical_centered_justified(|ui| {
                         if ui
                             .button(egui::RichText::new("Continue to the demo!").size(20.0))
                             .clicked()
                         {
-                            *close.write().unwrap() = true;
+                            close = true;
                         }
                     });
                 });
-            self.data.write().unwrap().about_is_open &= !*close_.read().unwrap();
+            self.about_is_open &= !close;
         } else {
             self.mobile_top_bar(ctx);
             self.show_windows(ctx);
@@ -288,22 +276,20 @@ impl DemoWindows {
 
     /// Show the open windows.
     fn show_windows(&mut self, ctx: &Context) {
-        let data = &mut *self.data.write().unwrap();
+        self.about.show(ctx, &mut self.about_is_open);
-        data.about.show(ctx, &mut data.about_is_open);
+        self.demos.windows(ctx);
-        data.demos.windows(ctx);
+        self.tests.windows(ctx);
-        data.tests.windows(ctx);
     }
 
     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| {
-                let data = &mut *self.data.write().unwrap();
+                ui.toggle_value(&mut self.about_is_open, self.about.name());
-                ui.toggle_value(&mut data.about_is_open, data.about.name());
 
                 ui.separator();
-                data.demos.checkboxes(ui);
+                self.demos.checkboxes(ui);
                 ui.separator();
-                data.tests.checkboxes(ui);
+                self.tests.checkboxes(ui);
                 ui.separator();
 
                 if ui.button("Organize windows").clicked() {

crates/egui_demo_lib/src/demo/drag_and_drop.rs

@@ -120,9 +120,8 @@ impl super::View for DragAndDropDemo {
         let id_source = "my_drag_and_drop_demo";
         let mut source_col_row = None;
         let mut drop_col = None;
-        let columns = &mut self.columns;
+        ui.columns(self.columns.len(), |uis| {
-        ui.columns(columns.len(), |uis| {
+            for (col_idx, column) in self.columns.clone().into_iter().enumerate() {
-            for (col_idx, column) in columns.clone().into_iter().enumerate() {
                 let ui = &mut uis[col_idx];
                 let can_accept_what_is_being_dragged = true; // We accept anything being dragged (for now) ¯\_(ツ)_/¯
                 let response = drop_target(ui, can_accept_what_is_being_dragged, |ui| {
@@ -133,7 +132,7 @@ impl super::View for DragAndDropDemo {
                             let response = ui.add(Label::new(item).sense(Sense::click()));
                             response.context_menu(|ui| {
                                 if ui.button("Remove").clicked() {
-                                    columns[col_idx].remove(row_idx);
+                                    self.columns[col_idx].remove(row_idx);
                                     ui.close_menu();
                                 }
                             });
@@ -148,7 +147,7 @@ impl super::View for DragAndDropDemo {
 
                 let response = response.context_menu(|ui| {
                     if ui.button("New Item").clicked() {
-                        columns[col_idx].push("New Item".to_owned());
+                        self.columns[col_idx].push("New Item".to_owned());
                         ui.close_menu();
                     }
                 });
@@ -164,8 +163,8 @@ impl super::View for DragAndDropDemo {
             if let Some(drop_col) = drop_col {
                 if ui.input(|i| i.pointer.any_released()) {
                     // do the drop:
-                    let item = columns[source_col].remove(source_row);
+                    let item = self.columns[source_col].remove(source_row);
-                    columns[drop_col].push(item);
+                    self.columns[drop_col].push(item);
                 }
             }
         }

crates/egui_demo_lib/src/demo/font_book.rs

@@ -1,4 +1,5 @@
 use std::collections::BTreeMap;
+
 pub struct FontBook {
     filter: String,
     font_id: egui::FontId,

crates/egui_demo_lib/src/demo/highlighting.rs

@@ -14,7 +14,7 @@ impl super::Demo for Highlighting {
             .open(open)
             .show(ctx, |ui| {
                 use super::View as _;
-                Self::default().ui(ui);
+                self.ui(ui);
             });
     }
 }

crates/egui_demo_lib/src/demo/plot_demo.rs

@@ -30,7 +30,8 @@ impl Default for Panel {
 }
 
 // ----------------------------------------------------------------------------
-#[derive(Default, PartialEq)]
+
+#[derive(PartialEq, Default)]
 pub struct PlotDemo {
     line_demo: LineDemo,
     marker_demo: MarkerDemo,

crates/egui_demo_lib/src/demo/sliders.rs

@@ -55,8 +55,7 @@ impl super::Demo for Sliders {
 
 impl super::View for Sliders {
     fn ui(&mut self, ui: &mut Ui) {
-        {
+        let Self {
-            let Sliders {
             min,
             max,
             logarithmic,
@@ -179,16 +178,13 @@ impl super::View for Sliders {
         ui.add_space(8.0);
 
         ui.checkbox(clamp_to_range, "Clamp to range");
-            ui.label(
+        ui.label("If true, the slider will clamp incoming and outgoing values to the given range.");
-                "If true, the slider will clamp incoming and outgoing values to the given range.",
-            );
         ui.label("If false, the slider can shows values outside its range, and you can manually enter values outside the range.");
         ui.add_space(8.0);
 
         ui.checkbox(smart_aim, "Smart Aim");
         ui.label("Smart Aim will guide you towards round values when you drag the slider so you you are more likely to hit 250 than 247.23");
         ui.add_space(8.0);
-        }
 
         ui.vertical_centered(|ui| {
             egui::reset_button(ui, self);

crates/egui_demo_lib/src/demo/strip_demo.rs

@@ -18,7 +18,7 @@ impl super::Demo for StripDemo {
             .default_width(400.0)
             .show(ctx, |ui| {
                 use super::View as _;
-                Self::default().ui(ui);
+                self.ui(ui);
             });
     }
 }

crates/egui_demo_lib/src/demo/table_demo.rs

@@ -51,7 +51,6 @@ const NUM_MANUAL_ROWS: usize = 20;
 
 impl super::View for TableDemo {
     fn ui(&mut self, ui: &mut egui::Ui) {
-        {
         ui.vertical(|ui| {
             ui.horizontal(|ui| {
                 ui.checkbox(&mut self.striped, "Striped");
@@ -98,7 +97,6 @@ impl super::View for TableDemo {
         });
 
         ui.separator();
-        }
 
         // Leave room for the source code link after the table demo:
         use egui_extras::{Size, StripBuilder};

crates/egui_demo_lib/src/demo/tests.rs

@@ -1,5 +1,3 @@
-use std::sync::{Arc, RwLock};
-
 #[derive(Default)]
 pub struct CursorTest {}
 
@@ -11,7 +9,7 @@ impl super::Demo for CursorTest {
     fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
         egui::Window::new(self.name()).open(open).show(ctx, |ui| {
             use super::View as _;
-            Self::default().ui(ui);
+            self.ui(ui);
         });
     }
 }
@@ -43,7 +41,7 @@ impl super::Demo for IdTest {
     fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
         egui::Window::new(self.name()).open(open).show(ctx, |ui| {
             use super::View as _;
-            Self::default().ui(ui);
+            self.ui(ui);
         });
     }
 }
@@ -180,6 +178,7 @@ impl super::View for ManualLayoutTest {
 }
 
 // ----------------------------------------------------------------------------
+
 #[derive(PartialEq)]
 pub struct TableTest {
     num_cols: usize,
@@ -216,14 +215,11 @@ impl super::Demo for TableTest {
 
 impl super::View for TableTest {
     fn ui(&mut self, ui: &mut egui::Ui) {
-        {
         ui.add(
-                egui::Slider::new(&mut self.min_col_width, 0.0..=400.0)
+            egui::Slider::new(&mut self.min_col_width, 0.0..=400.0).text("Minimum column width"),
-                    .text("Minimum column width"),
         );
         ui.add(
-                egui::Slider::new(&mut self.max_col_width, 0.0..=400.0)
+            egui::Slider::new(&mut self.max_col_width, 0.0..=400.0).text("Maximum column width"),
-                    .text("Maximum column width"),
         );
         ui.add(egui::Slider::new(&mut self.num_cols, 0..=5).text("Columns"));
         ui.add(egui::Slider::new(&mut self.num_rows, 0..=20).text("Rows"));
@@ -300,7 +296,6 @@ impl super::View for TableTest {
             ui.label("Fifth row, second column");
             ui.end_row();
         });
-        }
 
         ui.vertical_centered(|ui| {
             egui::reset_button(ui, self);
@@ -383,15 +378,14 @@ impl super::View for InputTest {
 
 // ----------------------------------------------------------------------------
 
-#[derive(Clone)]
 pub struct WindowResizeTest {
-    text: Arc<RwLock<String>>,
+    text: String,
 }
 
 impl Default for WindowResizeTest {
     fn default() -> Self {
         Self {
-            text: Arc::new(RwLock::new(crate::LOREM_IPSUM_LONG.to_owned())),
+            text: crate::LOREM_IPSUM_LONG.to_owned(),
         }
     }
 }
@@ -457,8 +451,6 @@ impl super::Demo for WindowResizeTest {
                 lorem_ipsum(ui, crate::LOREM_IPSUM);
             });
 
-        let clone = self.clone();
-
         Window::new("↔ resizable with TextEdit")
             .open(open)
             .vscroll(false)
@@ -466,8 +458,7 @@ impl super::Demo for WindowResizeTest {
             .default_height(300.0)
             .show(ctx, |ui| {
                 ui.label("Shows how you can fill an area with a widget.");
-                let mut text = clone.text.write().unwrap();
+                ui.add_sized(ui.available_size(), TextEdit::multiline(&mut self.text));
-                ui.add_sized(ui.available_size(), TextEdit::multiline(&mut *text));
             });
 
         Window::new("↔ freely resized")

crates/egui_demo_lib/src/demo/widget_gallery.rs

@@ -99,7 +99,7 @@ impl super::View for WidgetGallery {
 
 impl WidgetGallery {
     fn gallery_grid_contents(&mut self, ui: &mut egui::Ui) {
-        let WidgetGallery {
+        let Self {
             enabled: _,
             visible: _,
             boolean,

crates/egui_demo_lib/src/demo/window_options.rs

@@ -37,7 +37,7 @@ impl super::Demo for WindowOptions {
     }
 
     fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        let WindowOptions {
+        let Self {
             title,
             title_bar,
             closable,
@@ -75,7 +75,7 @@ impl super::Demo for WindowOptions {
 
 impl super::View for WindowOptions {
     fn ui(&mut self, ui: &mut egui::Ui) {
-        let WindowOptions {
+        let Self {
             title,
             title_bar,
             closable,

crates/egui_demo_lib/src/demo/window_with_panels.rs

@@ -14,7 +14,7 @@ impl super::Demo for WindowWithPanels {
             .default_height(400.0)
             .vscroll(false)
             .open(open);
-        window.show(ctx, |ui| Self {}.ui(ui));
+        window.show(ctx, |ui| self.ui(ui));
     }
 }