task-001: add border to button and spacing to navs

3 files changed, 11 insertions, 5 deletions

diff --git a/schist_desktop_gui/src/gui/components/button.rs b/schist_desktop_gui/src/gui/components/button.rs
index 8a33e39..c531e32 100644
--- a/schist_desktop_gui/src/gui/components/button.rs
+++ b/schist_desktop_gui/src/gui/components/button.rs
@@ -1,4 +1,4 @@
-use iced::{widget::Button, Element, Theme};
+use iced::{Element, Theme, border::Radius, widget::Button};
 
 use crate::style::*;
 
@@ -48,7 +48,8 @@ fn base_button_style(theme: &Theme) -> iced::widget::button::Style {
         )),
         border: iced::Border {
             color: theme.extended_palette().primary.base.text,
-            ..Default::default()
+            radius: Radius::new(u32::from(BORDER_RADIUS)),
+            width: f32::from(BORDER_WIDTH),
         },
         text_color: theme.extended_palette().primary.base.text,
         ..Default::default()
@@ -66,7 +67,7 @@ pub fn panel_button<'a, Content: Into<Element<'a, Message>>, Message>(
             border: iced::Border {
                 color: theme.extended_palette().primary.base.text,
                 radius: iced::border::Radius::new(0),
-                width: 2.0,
+                width: f32::from(BORDER_WIDTH_THICK),
             },
             ..Default::default()
         })
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 3f1da18..1ba5fef 100644
--- a/schist_desktop_gui/src/gui/components/navigation/view_navigation.rs
+++ b/schist_desktop_gui/src/gui/components/navigation/view_navigation.rs
@@ -1,6 +1,6 @@
 use iced::{widget::column, Element};
 
-use crate::traits::Viewable;
+use crate::{style::SPACING_SM, traits::Viewable};
 
 use super::{Message, Navigation};
 
@@ -22,6 +22,6 @@ where
             .iter()
             .map(|option| self.view_navigation_button(&option))
             .for_each(|option| options.push(option));
-        column(options).into()
+        column(options).spacing(u32::from(SPACING_SM)).into()
     }
 }
diff --git a/schist_desktop_gui/src/style.rs b/schist_desktop_gui/src/style.rs
index fd7c858..a94d540 100644
--- a/schist_desktop_gui/src/style.rs
+++ b/schist_desktop_gui/src/style.rs
@@ -1,3 +1,8 @@
+pub const BORDER_RADIUS: u16 = 2;
+pub const BORDER_WIDTH: u16 = 1;
+pub const BORDER_WIDTH_THICK: u16 = 2;
+
+pub const SPACING_SM: u16 = 12;
 pub const SPACING_MD: u16 = 24;
 pub const SPACING_LG: u16 = 32;