From 1046778d01f0669c43279835abbe38581ca2baf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= Date: Wed, 4 Sep 2024 15:21:51 +0200 Subject: [PATCH] improv: spacing/padding fixes --- src/theme/style/iced.rs | 4 ++-- src/widget/list/column.rs | 4 ++-- src/widget/menu/menu_tree.rs | 4 +--- src/widget/mod.rs | 4 ++-- src/widget/settings/item.rs | 4 ++-- src/widget/spin_button/mod.rs | 8 ++++---- src/widget/toggler.rs | 1 - 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs index 6c79823e..9b4095e7 100644 --- a/src/theme/style/iced.rs +++ b/src/theme/style/iced.rs @@ -975,12 +975,12 @@ impl rule::StyleSheet for Theme { color: self.current_container().divider.into(), width: 1, radius: 0.0.into(), - fill_mode: rule::FillMode::Padded(10), + fill_mode: rule::FillMode::Padded(8), }, Rule::HeavyDivider => rule::Appearance { color: self.current_container().divider.into(), width: 4, - radius: 4.0.into(), + radius: 2.0.into(), fill_mode: rule::FillMode::Full, }, Rule::Custom(f) => f(self), diff --git a/src/widget/list/column.rs b/src/widget/list/column.rs index 6de4517f..b2b3b5b9 100644 --- a/src/widget/list/column.rs +++ b/src/widget/list/column.rs @@ -21,7 +21,7 @@ pub struct ListColumn<'a, Message> { impl<'a, Message: 'static> Default for ListColumn<'a, Message> { fn default() -> Self { Self { - spacing: 12, + spacing: 8, padding: Padding::from(0), style: ::Style::List, children: Vec::with_capacity(4), @@ -66,7 +66,7 @@ impl<'a, Message: 'static> ListColumn<'a, Message> { .spacing(self.spacing) .padding(self.padding) .apply(super::container) - .padding([self.spacing, 0]) + .padding([self.spacing, 8]) .style(self.style) .into() } diff --git a/src/widget/menu/menu_tree.rs b/src/widget/menu/menu_tree.rs index f8ffb887..97590c57 100644 --- a/src/widget/menu/menu_tree.rs +++ b/src/widget/menu/menu_tree.rs @@ -6,10 +6,8 @@ use std::borrow::Cow; use std::collections::HashMap; use iced_widget::core::{renderer, Element}; -use iced_widget::horizontal_rule; use crate::iced_core::{Alignment, Length}; -use crate::widget::container; use crate::widget::menu::action::MenuAction; use crate::widget::menu::key_bind::KeyBind; use crate::{theme, widget}; @@ -290,7 +288,7 @@ where MenuItem::Divider => { if i != size - 1 { trees.push(MenuTree::::new( - container(horizontal_rule(1)).padding([0, 8]), + widget::divider::horizontal::light(), )); } } diff --git a/src/widget/mod.rs b/src/widget/mod.rs index c526bd23..7ef318f8 100644 --- a/src/widget/mod.rs +++ b/src/widget/mod.rs @@ -173,13 +173,13 @@ pub mod divider { /// Horizontal divider with light thickness #[must_use] pub fn light() -> Rule { - horizontal_rule(4).style(crate::theme::Rule::LightDivider) + horizontal_rule(1).style(crate::theme::Rule::LightDivider) } /// Horizontal divider with heavy thickness. #[must_use] pub fn heavy() -> Rule { - horizontal_rule(10).style(crate::theme::Rule::HeavyDivider) + horizontal_rule(4).style(crate::theme::Rule::HeavyDivider) } } diff --git a/src/widget/settings/item.rs b/src/widget/settings/item.rs index 3de4975f..723d53a5 100644 --- a/src/widget/settings/item.rs +++ b/src/widget/settings/item.rs @@ -33,7 +33,7 @@ pub fn item_row(children: Vec>) -> Row { row::with_children(children) .spacing(12) .align_items(iced::Alignment::Center) - .padding([0, 18]) + .padding([0, 16]) } /// A settings item aligned in a flex row @@ -52,7 +52,7 @@ pub fn flex_item<'a, Message: 'static>( #[allow(clippy::module_name_repetitions)] pub fn flex_item_row(children: Vec>) -> FlexRow { flex_row(children) - .padding([0, 18]) + .padding([0, 16]) .spacing(12) .min_item_width(200.0) .justify_items(iced::Alignment::Center) diff --git a/src/widget/spin_button/mod.rs b/src/widget/spin_button/mod.rs index b8806d6e..4aa07670 100644 --- a/src/widget/spin_button/mod.rs +++ b/src/widget/spin_button/mod.rs @@ -47,7 +47,7 @@ impl<'a, Message: 'static> SpinButton<'a, Message> { container( row::with_children(vec![ icon::from_name("list-remove-symbolic") - .size(24) + .size(16) .apply(container) .width(Length::Fixed(32.0)) .height(Length::Fixed(32.0)) @@ -59,14 +59,15 @@ impl<'a, Message: 'static> SpinButton<'a, Message> { .style(theme::Button::Text) .on_press(model::Message::Decrement) .into(), - text(label) + text::title4(label) .vertical_alignment(Vertical::Center) .apply(container) + .width(Length::Fixed(48.0)) .align_x(Horizontal::Center) .align_y(Vertical::Center) .into(), icon::from_name("list-add-symbolic") - .size(24) + .size(16) .apply(container) .width(Length::Fixed(32.0)) .height(Length::Fixed(32.0)) @@ -81,7 +82,6 @@ impl<'a, Message: 'static> SpinButton<'a, Message> { ]) .width(Length::Shrink) .height(Length::Fixed(32.0)) - .spacing(4.0) .align_items(Alignment::Center), ) .align_y(Vertical::Center) diff --git a/src/widget/toggler.rs b/src/widget/toggler.rs index 0831c9c4..4e92ffd4 100644 --- a/src/widget/toggler.rs +++ b/src/widget/toggler.rs @@ -14,6 +14,5 @@ where { widget::Toggler::new(label, is_checked, f) .size(24) - .spacing(12) .width(Length::Shrink) }