From 269d6f9a3f47861ff6fe67d65baf226192a3c22f Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 8 Sep 2022 17:36:59 -0400
Subject: fix: scrollable example

---
 examples/scrollable/src/main.rs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'examples/scrollable/src')

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index b7b3dedc..f0cd60f4 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -14,9 +14,15 @@ struct ScrollableDemo {
     variants: Vec<Variant>,
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+enum ThemeType {
+    Light,
+    Dark,
+}
+
 #[derive(Debug, Clone)]
 enum Message {
-    ThemeChanged(Theme),
+    ThemeChanged(ThemeType),
     ScrollToTop(usize),
     ScrollToBottom(usize),
     Scrolled(usize, f32),
@@ -45,7 +51,10 @@ impl Application for ScrollableDemo {
     fn update(&mut self, message: Message) -> Command<Message> {
         match message {
             Message::ThemeChanged(theme) => {
-                self.theme = theme;
+                self.theme = match theme {
+                    ThemeType::Light => Theme::Light,
+                    ThemeType::Dark => Theme::Dark,
+                };
 
                 Command::none()
             }
@@ -79,16 +88,16 @@ impl Application for ScrollableDemo {
 
     fn view(&self) -> Element<Message> {
         let ScrollableDemo {
-            theme, variants, ..
+            variants, ..
         } = self;
 
-        let choose_theme = [Theme::Light, Theme::Dark].iter().fold(
+        let choose_theme = [ThemeType::Light, ThemeType::Dark].iter().fold(
             column!["Choose a theme:"].spacing(10),
             |column, option| {
                 column.push(radio(
                     format!("{:?}", option),
                     *option,
-                    Some(*theme),
+                    Some(*option),
                     Message::ThemeChanged,
                 ))
             },
-- 
cgit 


From 4f3215f48e72ed36cb77efcb746db1f6adabf84f Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Sat, 10 Sep 2022 22:15:25 -0400
Subject: fix: clippy lint
 https://rust-lang.github.io/rust-clippy/master/index.html#large_enum_variant

---
 examples/scrollable/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/scrollable/src')

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index f0cd60f4..d5cf19cc 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -207,7 +207,7 @@ impl Application for ScrollableDemo {
     }
 
     fn theme(&self) -> Theme {
-        self.theme
+        self.theme.clone()
     }
 }
 
-- 
cgit 


From 3517dece26e33a627cee8957e4ac3d60be3cfb76 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 03:25:27 +0100
Subject: Run `cargo fmt`

---
 examples/scrollable/src/main.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'examples/scrollable/src')

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index d5cf19cc..6eba34e2 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -87,9 +87,7 @@ impl Application for ScrollableDemo {
     }
 
     fn view(&self) -> Element<Message> {
-        let ScrollableDemo {
-            variants, ..
-        } = self;
+        let ScrollableDemo { variants, .. } = self;
 
         let choose_theme = [ThemeType::Light, ThemeType::Dark].iter().fold(
             column!["Choose a theme:"].spacing(10),
-- 
cgit 


From f04336dd5cf5e15bbcf48cd54b7e97c569c07a92 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 03:26:10 +0100
Subject: Remove unnecessary `clone` in `scrollable` example

---
 examples/scrollable/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/scrollable/src')

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 6eba34e2..7e1716cf 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -205,7 +205,7 @@ impl Application for ScrollableDemo {
     }
 
     fn theme(&self) -> Theme {
-        self.theme.clone()
+        self.theme
     }
 }
 
-- 
cgit 


From df7877767567cc0c7f48d2d6da4680a55f0f7b6d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 3 Nov 2022 03:27:55 +0100
Subject: Box `Custom` in `Theme`

---
 examples/scrollable/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/scrollable/src')

diff --git a/examples/scrollable/src/main.rs b/examples/scrollable/src/main.rs
index 7e1716cf..6eba34e2 100644
--- a/examples/scrollable/src/main.rs
+++ b/examples/scrollable/src/main.rs
@@ -205,7 +205,7 @@ impl Application for ScrollableDemo {
     }
 
     fn theme(&self) -> Theme {
-        self.theme
+        self.theme.clone()
     }
 }
 
-- 
cgit