leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improv: spacing/padding fixes

Browse source
This commit is contained in:
Vukašin Vojinović 2024-09-04 15:21:51 +02:00 • committed by Michael Murphy
parent 71cd25c06d
commit 1046778d01
7 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/widget/list/column.rs
View file

@ -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: <crate::Theme as StyleSheet>::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()
}

4
src/widget/menu/menu_tree.rs
View file

@ -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::<Message, Renderer>::new(
container(horizontal_rule(1)).padding([0, 8]),
widget::divider::horizontal::light(),
));
}
}

4
src/widget/mod.rs
View file

@ -173,13 +173,13 @@ pub mod divider {
/// Horizontal divider with light thickness
#[must_use]
pub fn light() -> Rule<crate::Theme> {
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<crate::Theme> {
horizontal_rule(10).style(crate::theme::Rule::HeavyDivider)
horizontal_rule(4).style(crate::theme::Rule::HeavyDivider)
}
}

4
src/widget/settings/item.rs
View file

@ -33,7 +33,7 @@ pub fn item_row<Message>(children: Vec<Element<Message>>) -> Row<Message> {
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<Message>(children: Vec<Element<Message>>) -> FlexRow<Message> {
flex_row(children)
.padding([0, 18])
.padding([0, 16])
.spacing(12)
.min_item_width(200.0)
.justify_items(iced::Alignment::Center)

8
src/widget/spin_button/mod.rs
View file

@ -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)

1
src/widget/toggler.rs
View file

@ -14,6 +14,5 @@ where
{
widget::Toggler::new(label, is_checked, f)
.size(24)
.spacing(12)
.width(Length::Shrink)
}