From 7dfd180b167034f9493dea9dd34862f6a197d241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= Date: Fri, 15 Nov 2024 00:56:59 +0100 Subject: [PATCH 1/2] fix(footer): corner radius --- src/theme/style/iced.rs | 16 ++++------------ src/widget/context_drawer/widget.rs | 3 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs index 8a49ec09a94..530df55fefa 100644 --- a/src/theme/style/iced.rs +++ b/src/theme/style/iced.rs @@ -6,7 +6,6 @@ use crate::theme::{CosmicComponent, Theme, TRANSPARENT_COMPONENT}; use cosmic_theme::composite::over; use iced::{ - border, color, overlay::menu, widget::{ button as iced_button, checkbox as iced_checkbox, container as iced_container, pane_grid, @@ -14,7 +13,6 @@ use iced::{ slider::{self, Rail}, svg, toggler, }, - Gradient, }; use iced_core::{Background, Border, Color, Shadow, Vector}; use iced_widget::{pane_grid::Highlight, text_editor, text_input}; @@ -411,7 +409,7 @@ impl<'a> Container<'a> { text_color: Some(Color::from(theme.background.on)), background: Some(iced::Background::Color(theme.background.base.into())), border: Border { - radius: theme.corner_radii.radius_xs.into(), + radius: theme.corner_radii.radius_s.into(), ..Default::default() }, shadow: Shadow::default(), @@ -425,7 +423,7 @@ impl<'a> Container<'a> { text_color: Some(Color::from(theme.primary.on)), background: Some(iced::Background::Color(theme.primary.base.into())), border: Border { - radius: theme.corner_radii.radius_xs.into(), + radius: theme.corner_radii.radius_s.into(), ..Default::default() }, shadow: Shadow::default(), @@ -439,7 +437,7 @@ impl<'a> Container<'a> { text_color: Some(Color::from(theme.secondary.on)), background: Some(iced::Background::Color(theme.secondary.base.into())), border: Border { - radius: theme.corner_radii.radius_xs.into(), + radius: theme.corner_radii.radius_s.into(), ..Default::default() }, shadow: Shadow::default(), @@ -531,13 +529,7 @@ impl iced_container::Catalog for Theme { } Container::ContextDrawer => { - let mut appearance = crate::style::Container::primary(cosmic); - - appearance.border = Border { - color: cosmic.primary.divider.into(), - width: 0.0, - radius: cosmic.corner_radii.radius_s.into(), - }; + let mut appearance = Container::primary(cosmic); appearance.shadow = Shadow { color: cosmic.shade.into(), diff --git a/src/widget/context_drawer/widget.rs b/src/widget/context_drawer/widget.rs index 866c024c7d5..fafa8a19ce5 100644 --- a/src/widget/context_drawer/widget.rs +++ b/src/widget/context_drawer/widget.rs @@ -39,7 +39,6 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> { { let cosmic_theme::Spacing { space_xxs, - space_xs, space_s, space_m, space_l, @@ -78,7 +77,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> { container(element) .width(Length::Fixed(480.0)) .align_y(Alignment::Center) - .padding([space_xs, horizontal_padding]) + .padding([space_xxs, horizontal_padding]) }); let pane = column::with_capacity(3) .push(header) From af2f5d3b1d18e281f4fdd424c8bafd9139d11d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= Date: Tue, 19 Nov 2024 01:34:46 +0100 Subject: [PATCH 2/2] update iced --- iced | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iced b/iced index 256863574ba..d7b189d2aa2 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 256863574bacfb1d2797c2a48cba7a3388cbeb59 +Subproject commit d7b189d2aa2b4b3b2eabed7a796081a521aedacf