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

refactor(theme): create Container::ContextDrawer style variant

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-03-05 15:01:32 +01:00 • committed by Jeremy Soller
parent 88da3fcc14
commit db5d989972
4 changed files with 82 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/widget/context_drawer/widget.rs
View file

@ -8,9 +8,9 @@ use crate::{Apply, Element, Renderer, Theme};
use super::overlay::Overlay;
use iced_core::alignment;
use iced_core::event::{self, Event};
use iced_core::widget::{Operation, Tree};
use iced_core::{alignment, Border};
use iced_core::{
layout, mouse, overlay as iced_overlay, renderer, Clipboard, Color, Layout, Length, Padding,
Rectangle, Shell, Widget,
@ -85,20 +85,7 @@ impl<'a, Message: Clone + 'static> ContextDrawer<'a, Message> {
// XXX this is a hack to get around that
drawer: container(
LayerContainer::new(pane)
.style(crate::style::Container::custom(move |theme| {
let palette = theme.cosmic();
container::Appearance {
icon_color: Some(Color::from(palette.primary.on)),
text_color: Some(Color::from(palette.primary.on)),
background: Some(iced::Background::Color(palette.primary.base.into())),
border: Border {
radius: palette.corner_radii.radius_s.into(),
..Default::default()
},
..Default::default()
}
}))
.style(crate::style::Container::ContextDrawer)
.layer(cosmic_theme::Layer::Primary)
.width(Length::Fill)
.height(Length::Fill)

3
src/widget/settings/item.rs
View file

@ -9,7 +9,6 @@ use crate::{
};
use derive_setters::Setters;
use iced_core::Length;
use iced_widget::container;
/// A settings item aligned in a row
#[must_use]
@ -80,7 +79,7 @@ impl<'a, Message: 'static> Item<'a, Message> {
contents.push(text(self.title).width(Length::Fill).into());
}
contents.push(widget.into().into());
contents.push(widget.into());
item_row(contents)
}