leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(app-list): reduce duplicate code

Browse source
This commit is contained in:
Vukašin Vojinović 2024-07-06 01:54:06 +02:00 • committed by Michael Murphy
parent 08bbc1cf95
commit 5bf6875ad3
1 changed files with 36 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

115
cosmic-app-list/src/app.rs
View file

@ -86,12 +86,13 @@ impl AppletIconData {
fn new(applet: &Context) -> Self { fn new(applet: &Context) -> Self {
let icon_size = applet.suggested_size(false).0; let icon_size = applet.suggested_size(false).0;
let padding = applet.suggested_padding(false); let padding = applet.suggested_padding(false);
let icon_spacing = 0.0;
let (icon_spacing, dot_radius, bar_size) = match applet.size { let (dot_radius, bar_size) = match applet.size {
Size::PanelSize(PanelSize::XL) | Size::PanelSize(PanelSize::L) => (0.0, 2.0, 12.0), Size::PanelSize(PanelSize::XL) | Size::PanelSize(PanelSize::L) => (2.0, 12.0),
Size::PanelSize(PanelSize::M) => (0.0, 2.0, 8.0), Size::PanelSize(PanelSize::M) => (2.0, 8.0),
Size::PanelSize(PanelSize::S) | Size::PanelSize(PanelSize::XS) | Size::Hardcoded(_) => { Size::PanelSize(PanelSize::S) | Size::PanelSize(PanelSize::XS) | Size::Hardcoded(_) => {
(0.0, 1.0, 8.0) (1.0, 8.0)
} }
}; };
@ -176,86 +177,42 @@ impl DockItem {
.into() .into()
}) })
.collect_vec() .collect_vec()
} else if toplevels.len() == 1 { } else {
(0..1) (0..1)
.map(|_| { .map(|_| {
container(vertical_space(Length::Fixed(0.0))) container(if toplevels.len() == 1 {
.padding(app_icon.dot_radius) vertical_space(Length::Fixed(0.0))
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new( } else {
move |theme| container::Appearance { match applet.anchor {
text_color: Some(Color::TRANSPARENT), PanelAnchor::Left | PanelAnchor::Right => {
background: if is_focused { vertical_space(app_icon.bar_size)
Some(Background::Color(theme.cosmic().accent_color().into())) }
} else { PanelAnchor::Top | PanelAnchor::Bottom => {
Some(Background::Color(theme.cosmic().on_bg_color().into())) horizontal_space(app_icon.bar_size)
}, }
border: Border { }
radius: dot_border_radius.into(), })
width: 0.0, .padding(app_icon.dot_radius)
color: Color::TRANSPARENT, .style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
}, move |theme| container::Appearance {
shadow: Shadow::default(), text_color: Some(Color::TRANSPARENT),
icon_color: Some(Color::TRANSPARENT), background: if is_focused {
Some(Background::Color(theme.cosmic().accent_color().into()))
} else {
Some(Background::Color(theme.cosmic().on_bg_color().into()))
}, },
))) border: Border {
.into() radius: dot_border_radius.into(),
width: 0.0,
color: Color::TRANSPARENT,
},
shadow: Shadow::default(),
icon_color: Some(Color::TRANSPARENT),
},
)))
.into()
}) })
.collect_vec() .collect_vec()
} else {
match applet.anchor {
PanelAnchor::Left | PanelAnchor::Right => (0..1)
.map(|_| {
container(vertical_space(app_icon.bar_size))
.padding(app_icon.dot_radius)
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
move |theme| container::Appearance {
text_color: Some(Color::TRANSPARENT),
background: if is_focused {
Some(Background::Color(
theme.cosmic().accent_color().into(),
))
} else {
Some(Background::Color(theme.cosmic().on_bg_color().into()))
},
border: Border {
radius: dot_border_radius.into(),
width: 0.0,
color: Color::TRANSPARENT,
},
shadow: Shadow::default(),
icon_color: Some(Color::TRANSPARENT),
},
)))
.into()
})
.collect_vec(),
PanelAnchor::Top | PanelAnchor::Bottom => (0..1)
.map(|_| {
container(horizontal_space(app_icon.bar_size))
.padding(app_icon.dot_radius)
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
move |theme| container::Appearance {
text_color: Some(Color::TRANSPARENT),
background: if is_focused {
Some(Background::Color(
theme.cosmic().accent_color().into(),
))
} else {
Some(Background::Color(theme.cosmic().on_bg_color().into()))
},
border: Border {
radius: dot_border_radius.into(),
width: 0.0,
color: Color::TRANSPARENT,
},
shadow: Shadow::default(),
icon_color: Some(Color::TRANSPARENT),
},
)))
.into()
})
.collect_vec(),
}
}; };
let icon_wrapper: Element<_> = match applet.anchor { let icon_wrapper: Element<_> = match applet.anchor {