Merge pull request 'random-stuff' (#4) from random-stuff into main

Reviewed-on: https://git.joeac.net/joeac/schist/pulls/4

1 files changed, 19 insertions, 18 deletions

diff --git a/schist_desktop_gui/src/gui/components/navigation/view_navigation.rs b/schist_desktop_gui/src/gui/components/navigation/view_navigation.rs
index beec818..3f1da18 100644
--- a/schist_desktop_gui/src/gui/components/navigation/view_navigation.rs
+++ b/schist_desktop_gui/src/gui/components/navigation/view_navigation.rs
@@ -1,26 +1,27 @@
 use iced::{widget::column, Element};
 
+use crate::traits::Viewable;
+
 use super::{Message, Navigation};
 
-pub fn view_navigation<'a, TOption>(
-    navigation: &'a Navigation<TOption>,
-) -> Element<'a, Message<TOption>>
+impl<'a, TOption> Viewable<'a, Message<TOption>> for Navigation<TOption>
 where
-    TOption: Clone + PartialEq + Into<Element<'a, Message<TOption>>>,
+    TOption: Clone + PartialEq + 'a,
+    Element<'a, Message<TOption>>: From<&'a TOption>,
 {
-    let mut options = Vec::new();
-    navigation
-        .options_before_active
-        .iter()
-        .map(|option| navigation.button(&option))
-        .for_each(|option| options.push(option));
-    if let Some(active_option) = navigation.active_option.as_ref() {
-        options.push(navigation.button(&active_option));
+    fn view(&'a self) -> iced::Element<'a, Message<TOption>> {
+        let mut options = Vec::new();
+        self.options_before_active
+            .iter()
+            .map(|option| self.view_navigation_button(&option))
+            .for_each(|option| options.push(option));
+        if let Some(active_option) = self.active_option.as_ref() {
+            options.push(self.view_navigation_button(&active_option));
+        }
+        self.options_after_active
+            .iter()
+            .map(|option| self.view_navigation_button(&option))
+            .for_each(|option| options.push(option));
+        column(options).into()
     }
-    navigation
-        .options_after_active
-        .iter()
-        .map(|option| navigation.button(&option))
-        .for_each(|option| options.push(option));
-    column(options).into()
 }