From d527bf2693fa8969577cf1fbbcaab00e0a9971cb Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sat, 29 Aug 2026 09:59:51 +0100 Subject: task-001: add border to button and spacing to navs --- schist_desktop_gui/src/gui/components/button.rs | 7 ++++--- .../src/gui/components/navigation/view_navigation.rs | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'schist_desktop_gui/src/gui') 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>, 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() } } -- cgit v1.2.3