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

fix: gap between corner of window content and headerbar

Browse source
This commit is contained in:
Ashley Wulber 2024-02-01 14:10:44 -05:00 • committed by Ashley Wulber
parent 925f5f0993
commit c571a289b4
2 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/mod.rs
View file

@ -645,7 +645,7 @@ impl<App: Application> ApplicationExt for App {
.padding([0, 8, 8, 8]) .padding([0, 8, 8, 8])
.width(iced::Length::Fill) .width(iced::Length::Fill)
.height(iced::Length::Fill) .height(iced::Length::Fill)
.style(crate::theme::Container::Background) .style(crate::theme::Container::WindowBackground)
.into() .into()
} else { } else {
content_row.into() content_row.into()

45
src/theme/style/iced.rs
View file

@ -5,8 +5,8 @@
use crate::theme::{CosmicComponent, Theme, TRANSPARENT_COMPONENT}; use crate::theme::{CosmicComponent, Theme, TRANSPARENT_COMPONENT};
use cosmic_theme::composite::over; use cosmic_theme::composite::over;
use iced_core::Border;
use iced_core::{Background, Color}; use iced_core::{Background, Color};
use iced_core::{Border, Shadow};
use iced_style::application; use iced_style::application;
use iced_style::button as iced_button; use iced_style::button as iced_button;
use iced_style::checkbox; use iced_style::checkbox;
@ -359,6 +359,7 @@ impl checkbox::StyleSheet for Theme {
*/ */
#[derive(Default)] #[derive(Default)]
pub enum Container { pub enum Container {
WindowBackground,
Background, Background,
Card, Card,
Custom(Box<dyn Fn(&Theme) -> container::Appearance>), Custom(Box<dyn Fn(&Theme) -> container::Appearance>),
@ -386,6 +387,22 @@ impl container::StyleSheet for Theme {
match style { match style {
Container::Transparent => container::Appearance::default(), Container::Transparent => container::Appearance::default(),
Container::Custom(f) => f(self), Container::Custom(f) => f(self),
Container::WindowBackground => container::Appearance {
icon_color: Some(Color::from(cosmic.background.on)),
text_color: Some(Color::from(cosmic.background.on)),
background: Some(iced::Background::Color(cosmic.background.base.into())),
border: Border {
radius: [
cosmic.corner_radii.radius_0[0],
cosmic.corner_radii.radius_0[1],
cosmic.corner_radii.radius_xs[2],
cosmic.corner_radii.radius_xs[3],
]
.into(),
..Default::default()
},
shadow: Shadow::default(),
},
Container::Background => container::Appearance { Container::Background => container::Appearance {
icon_color: Some(Color::from(cosmic.background.on)), icon_color: Some(Color::from(cosmic.background.on)),
text_color: Some(Color::from(cosmic.background.on)), text_color: Some(Color::from(cosmic.background.on)),
@ -394,7 +411,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_xs.into(), radius: cosmic.corner_radii.radius_xs.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
Container::HeaderBar => { Container::HeaderBar => {
let header_top = cosmic.background.base; let header_top = cosmic.background.base;
@ -404,10 +421,16 @@ impl container::StyleSheet for Theme {
text_color: Some(Color::from(cosmic.background.on)), text_color: Some(Color::from(cosmic.background.on)),
background: Some(iced::Background::Color(header_top.into())), background: Some(iced::Background::Color(header_top.into())),
border: Border { border: Border {
radius: cosmic.corner_radii.radius_xs.into(), radius: [
cosmic.corner_radii.radius_xs[0],
cosmic.corner_radii.radius_xs[1],
cosmic.corner_radii.radius_0[2],
cosmic.corner_radii.radius_0[3],
]
.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
} }
} }
Container::Primary => container::Appearance { Container::Primary => container::Appearance {
@ -418,7 +441,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_xs.into(), radius: cosmic.corner_radii.radius_xs.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
Container::Secondary => container::Appearance { Container::Secondary => container::Appearance {
icon_color: Some(Color::from(cosmic.secondary.on)), icon_color: Some(Color::from(cosmic.secondary.on)),
@ -428,7 +451,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_xs.into(), radius: cosmic.corner_radii.radius_xs.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
Container::Dropdown => { Container::Dropdown => {
let theme = self.cosmic(); let theme = self.cosmic();
@ -441,7 +464,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_xs.into(), radius: cosmic.corner_radii.radius_xs.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
} }
} }
Container::Tooltip => container::Appearance { Container::Tooltip => container::Appearance {
@ -452,7 +475,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_l.into(), radius: cosmic.corner_radii.radius_l.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
Container::Card => { Container::Card => {
@ -469,7 +492,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_s.into(), radius: cosmic.corner_radii.radius_s.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
cosmic_theme::Layer::Primary => container::Appearance { cosmic_theme::Layer::Primary => container::Appearance {
icon_color: Some(Color::from(cosmic.primary.component.on)), icon_color: Some(Color::from(cosmic.primary.component.on)),
@ -481,7 +504,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_s.into(), radius: cosmic.corner_radii.radius_s.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
cosmic_theme::Layer::Secondary => container::Appearance { cosmic_theme::Layer::Secondary => container::Appearance {
icon_color: Some(Color::from(cosmic.secondary.component.on)), icon_color: Some(Color::from(cosmic.secondary.component.on)),
@ -493,7 +516,7 @@ impl container::StyleSheet for Theme {
radius: cosmic.corner_radii.radius_s.into(), radius: cosmic.corner_radii.radius_s.into(),
..Default::default() ..Default::default()
}, },
shadow: Default::default(), shadow: Shadow::default(),
}, },
} }
} }