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

fix

Browse source
This commit is contained in:
Vukašin Vojinović 2024-11-26 19:34:43 +01:00 • committed by Ashley Wulber
parent 96c67e29a4
commit a6db807c1b
2 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/app/mod.rs
View file

@ -882,30 +882,7 @@ impl<App: Application> ApplicationExt for App {
header = header.end(element.map(Message::App)); header = header.end(element.map(Message::App));
} }
header header.apply(|w| id_container(w, iced_core::id::Id::new("COSMIC_header")))
// Needed for apps without a content container, but with a header bar
.apply(container)
.style(move |theme| container::Style {
background: if content_container {
None
} else {
Some(iced::Background::Color(
theme.cosmic().background.base.into(),
))
},
border: iced::Border {
radius: [
theme.cosmic().radius_s()[0] - 1.0,
theme.cosmic().radius_s()[1] - 1.0,
theme.cosmic().radius_0()[2],
theme.cosmic().radius_0()[3],
]
.into(),
..Default::default()
},
..Default::default()
})
.apply(|w| id_container(w, iced_core::id::Id::new("COSMIC_header")))
}) })
} else { } else {
None None

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

@ -469,8 +469,17 @@ impl iced_container::Catalog for Theme {
Container::WindowBackground => iced_container::Style { Container::WindowBackground => iced_container::Style {
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)),
background: None, background: Some(iced::Background::Color(cosmic.background.base.into())),
border: Border::default(), border: Border {
radius: [
cosmic.corner_radii.radius_0[0],
cosmic.corner_radii.radius_0[1],
cosmic.corner_radii.radius_s[2],
cosmic.corner_radii.radius_s[3],
]
.into(),
..Default::default()
},
shadow: Shadow::default(), shadow: Shadow::default(),
}, },
@ -504,8 +513,17 @@ impl iced_container::Catalog for Theme {
iced_container::Style { iced_container::Style {
icon_color: Some(icon_color), icon_color: Some(icon_color),
text_color: Some(text_color), text_color: Some(text_color),
background: None, background: Some(iced::Background::Color(cosmic.background.base.into())),
border: Border::default(), border: Border {
radius: [
cosmic.corner_radii.radius_s[0],
cosmic.corner_radii.radius_s[1],
cosmic.corner_radii.radius_0[2],
cosmic.corner_radii.radius_0[3],
]
.into(),
..Default::default()
},
shadow: Shadow::default(), shadow: Shadow::default(),
} }
} }