refactor navigation

1 files changed, 16 insertions, 16 deletions

diff --git a/schist_desktop_gui/src/gui/components/navigation/view_navigation_button.rs b/schist_desktop_gui/src/gui/components/navigation/view_navigation_button.rs
index 3132bf1..d65328c 100644
--- a/schist_desktop_gui/src/gui/components/navigation/view_navigation_button.rs
+++ b/schist_desktop_gui/src/gui/components/navigation/view_navigation_button.rs
@@ -4,24 +4,24 @@ use crate::gui::components::{active_button, inactive_button};
 
 use super::{Message, Navigation};
 
-pub fn view_navigation_button<'a, TOption>(
-    navigation: &'a Navigation<TOption>,
-    option: &'a TOption,
-) -> Element<'a, Message<TOption>>
+impl<'a, TOption> Navigation<TOption>
 where
-    TOption: Clone + PartialEq + Into<Element<'a, Message<TOption>>>,
+    TOption: Clone + PartialEq + 'a,
+    Element<'a, Message<TOption>>: From<&'a TOption>,
 {
-    if navigation
-        .active_option
-        .as_ref()
-        .is_some_and(|o| *o == *option)
-    {
-        active_button(Into::<Element<'a, Message<TOption>>>::into(option.clone())).into()
-    } else {
-        inactive_button(
-            Into::<Element<'a, Message<TOption>>>::into(option.clone()),
-            Message::SelectOption(option.clone()),
-        )
+    pub(super) fn view_navigation_button(
+        &'a self,
+        option: &'a TOption,
+    ) -> Element<'a, Message<TOption>> {
+        if self
+            .active_option
+            .as_ref()
+            .is_some_and(|o| TOption::eq(o, option))
+        {
+            active_button(option)
+        } else {
+            inactive_button(option, Message::SelectOption(option.clone()))
+        }
         .into()
     }
 }