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

fix(list_column): match padding/spacing to designs

Browse source
This commit is contained in:
Vukašin Vojinović 2024-11-28 15:24:15 +01:00 • committed by Michael Murphy
parent a6c08d68f9
commit de0c1921f7
11 changed files with 65 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/app/mod.rs
View file

@ -888,7 +888,7 @@ impl<App: Application> ApplicationExt for App {
// Needed to avoid header bar corner gaps for apps without a content container
header
.apply(container)
.style(move |theme| container::Style {
.class(crate::theme::Container::custom(|theme| container::Style {
background: Some(iced::Background::Color(
theme.cosmic().background.base.into(),
)),
@ -903,7 +903,7 @@ impl<App: Application> ApplicationExt for App {
..Default::default()
},
..Default::default()
})
}))
.apply(|w| id_container(w, iced_core::id::Id::new("COSMIC_header")))
}
})
@ -914,21 +914,23 @@ impl<App: Application> ApplicationExt for App {
.push(content)
.apply(container)
.padding(if sharp_corners { 0 } else { 1 })
.style(move |theme| container::Style {
background: if content_container {
Some(iced::Background::Color(
theme.cosmic().background.base.into(),
))
} else {
None
},
border: iced::Border {
color: theme.cosmic().bg_divider().into(),
width: if sharp_corners { 0.0 } else { 1.0 },
radius: theme.cosmic().radius_s().into(),
},
..Default::default()
});
.class(crate::theme::Container::custom(move |theme| {
container::Style {
background: if content_container {
Some(iced::Background::Color(
theme.cosmic().background.base.into(),
))
} else {
None
},
border: iced::Border {
color: theme.cosmic().bg_divider().into(),
width: if sharp_corners { 0.0 } else { 1.0 },
radius: theme.cosmic().radius_s().into(),
},
..Default::default()
}
}));
// Show any current dialog on top and centered over the view content
// We have to use a popover even without a dialog to keep the tree from changing