improv: spacing/padding fixes
This commit is contained in:
parent
71cd25c06d
commit
1046778d01
7 changed files with 13 additions and 16 deletions
|
|
@ -975,12 +975,12 @@ impl rule::StyleSheet for Theme {
|
||||||
color: self.current_container().divider.into(),
|
color: self.current_container().divider.into(),
|
||||||
width: 1,
|
width: 1,
|
||||||
radius: 0.0.into(),
|
radius: 0.0.into(),
|
||||||
fill_mode: rule::FillMode::Padded(10),
|
fill_mode: rule::FillMode::Padded(8),
|
||||||
},
|
},
|
||||||
Rule::HeavyDivider => rule::Appearance {
|
Rule::HeavyDivider => rule::Appearance {
|
||||||
color: self.current_container().divider.into(),
|
color: self.current_container().divider.into(),
|
||||||
width: 4,
|
width: 4,
|
||||||
radius: 4.0.into(),
|
radius: 2.0.into(),
|
||||||
fill_mode: rule::FillMode::Full,
|
fill_mode: rule::FillMode::Full,
|
||||||
},
|
},
|
||||||
Rule::Custom(f) => f(self),
|
Rule::Custom(f) => f(self),
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ pub struct ListColumn<'a, Message> {
|
||||||
impl<'a, Message: 'static> Default for ListColumn<'a, Message> {
|
impl<'a, Message: 'static> Default for ListColumn<'a, Message> {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
spacing: 12,
|
spacing: 8,
|
||||||
padding: Padding::from(0),
|
padding: Padding::from(0),
|
||||||
style: <crate::Theme as StyleSheet>::Style::List,
|
style: <crate::Theme as StyleSheet>::Style::List,
|
||||||
children: Vec::with_capacity(4),
|
children: Vec::with_capacity(4),
|
||||||
|
|
@ -66,7 +66,7 @@ impl<'a, Message: 'static> ListColumn<'a, Message> {
|
||||||
.spacing(self.spacing)
|
.spacing(self.spacing)
|
||||||
.padding(self.padding)
|
.padding(self.padding)
|
||||||
.apply(super::container)
|
.apply(super::container)
|
||||||
.padding([self.spacing, 0])
|
.padding([self.spacing, 8])
|
||||||
.style(self.style)
|
.style(self.style)
|
||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,8 @@ use std::borrow::Cow;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use iced_widget::core::{renderer, Element};
|
use iced_widget::core::{renderer, Element};
|
||||||
use iced_widget::horizontal_rule;
|
|
||||||
|
|
||||||
use crate::iced_core::{Alignment, Length};
|
use crate::iced_core::{Alignment, Length};
|
||||||
use crate::widget::container;
|
|
||||||
use crate::widget::menu::action::MenuAction;
|
use crate::widget::menu::action::MenuAction;
|
||||||
use crate::widget::menu::key_bind::KeyBind;
|
use crate::widget::menu::key_bind::KeyBind;
|
||||||
use crate::{theme, widget};
|
use crate::{theme, widget};
|
||||||
|
|
@ -290,7 +288,7 @@ where
|
||||||
MenuItem::Divider => {
|
MenuItem::Divider => {
|
||||||
if i != size - 1 {
|
if i != size - 1 {
|
||||||
trees.push(MenuTree::<Message, Renderer>::new(
|
trees.push(MenuTree::<Message, Renderer>::new(
|
||||||
container(horizontal_rule(1)).padding([0, 8]),
|
widget::divider::horizontal::light(),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -173,13 +173,13 @@ pub mod divider {
|
||||||
/// Horizontal divider with light thickness
|
/// Horizontal divider with light thickness
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn light() -> Rule<crate::Theme> {
|
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.
|
/// Horizontal divider with heavy thickness.
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn heavy() -> Rule<crate::Theme> {
|
pub fn heavy() -> Rule<crate::Theme> {
|
||||||
horizontal_rule(10).style(crate::theme::Rule::HeavyDivider)
|
horizontal_rule(4).style(crate::theme::Rule::HeavyDivider)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ pub fn item_row<Message>(children: Vec<Element<Message>>) -> Row<Message> {
|
||||||
row::with_children(children)
|
row::with_children(children)
|
||||||
.spacing(12)
|
.spacing(12)
|
||||||
.align_items(iced::Alignment::Center)
|
.align_items(iced::Alignment::Center)
|
||||||
.padding([0, 18])
|
.padding([0, 16])
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A settings item aligned in a flex row
|
/// A settings item aligned in a flex row
|
||||||
|
|
@ -52,7 +52,7 @@ pub fn flex_item<'a, Message: 'static>(
|
||||||
#[allow(clippy::module_name_repetitions)]
|
#[allow(clippy::module_name_repetitions)]
|
||||||
pub fn flex_item_row<Message>(children: Vec<Element<Message>>) -> FlexRow<Message> {
|
pub fn flex_item_row<Message>(children: Vec<Element<Message>>) -> FlexRow<Message> {
|
||||||
flex_row(children)
|
flex_row(children)
|
||||||
.padding([0, 18])
|
.padding([0, 16])
|
||||||
.spacing(12)
|
.spacing(12)
|
||||||
.min_item_width(200.0)
|
.min_item_width(200.0)
|
||||||
.justify_items(iced::Alignment::Center)
|
.justify_items(iced::Alignment::Center)
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ impl<'a, Message: 'static> SpinButton<'a, Message> {
|
||||||
container(
|
container(
|
||||||
row::with_children(vec![
|
row::with_children(vec![
|
||||||
icon::from_name("list-remove-symbolic")
|
icon::from_name("list-remove-symbolic")
|
||||||
.size(24)
|
.size(16)
|
||||||
.apply(container)
|
.apply(container)
|
||||||
.width(Length::Fixed(32.0))
|
.width(Length::Fixed(32.0))
|
||||||
.height(Length::Fixed(32.0))
|
.height(Length::Fixed(32.0))
|
||||||
|
|
@ -59,14 +59,15 @@ impl<'a, Message: 'static> SpinButton<'a, Message> {
|
||||||
.style(theme::Button::Text)
|
.style(theme::Button::Text)
|
||||||
.on_press(model::Message::Decrement)
|
.on_press(model::Message::Decrement)
|
||||||
.into(),
|
.into(),
|
||||||
text(label)
|
text::title4(label)
|
||||||
.vertical_alignment(Vertical::Center)
|
.vertical_alignment(Vertical::Center)
|
||||||
.apply(container)
|
.apply(container)
|
||||||
|
.width(Length::Fixed(48.0))
|
||||||
.align_x(Horizontal::Center)
|
.align_x(Horizontal::Center)
|
||||||
.align_y(Vertical::Center)
|
.align_y(Vertical::Center)
|
||||||
.into(),
|
.into(),
|
||||||
icon::from_name("list-add-symbolic")
|
icon::from_name("list-add-symbolic")
|
||||||
.size(24)
|
.size(16)
|
||||||
.apply(container)
|
.apply(container)
|
||||||
.width(Length::Fixed(32.0))
|
.width(Length::Fixed(32.0))
|
||||||
.height(Length::Fixed(32.0))
|
.height(Length::Fixed(32.0))
|
||||||
|
|
@ -81,7 +82,6 @@ impl<'a, Message: 'static> SpinButton<'a, Message> {
|
||||||
])
|
])
|
||||||
.width(Length::Shrink)
|
.width(Length::Shrink)
|
||||||
.height(Length::Fixed(32.0))
|
.height(Length::Fixed(32.0))
|
||||||
.spacing(4.0)
|
|
||||||
.align_items(Alignment::Center),
|
.align_items(Alignment::Center),
|
||||||
)
|
)
|
||||||
.align_y(Vertical::Center)
|
.align_y(Vertical::Center)
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,5 @@ where
|
||||||
{
|
{
|
||||||
widget::Toggler::new(label, is_checked, f)
|
widget::Toggler::new(label, is_checked, f)
|
||||||
.size(24)
|
.size(24)
|
||||||
.spacing(12)
|
|
||||||
.width(Length::Shrink)
|
.width(Length::Shrink)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue