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

fix: center and enlarge app-list icons

Browse source
This commit is contained in:
Ryan Brue 2024-03-03 00:24:44 -06:00 • committed by Ashley Wulber
parent 674e0940c5
commit bd1f7d6064
1 changed files with 84 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,53 +139,100 @@ impl DockItem {
let cosmic_icon = desktop_info let cosmic_icon = desktop_info
.icon .icon
.as_cosmic_icon() .as_cosmic_icon()
.size(applet.suggested_size().0); .size(applet.suggested_size().0 + 6);
let dot_radius = 2; let dot_radius = 2;
let dots = (0..min(toplevels.len(), 3)) let dot_spacer = (0..1)
.map(|_| { .map(|_| {
container(vertical_space(Length::Fixed(0.0))) container(vertical_space(Length::Fixed(0.0)))
.padding(dot_radius) .padding(dot_radius)
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
|theme| container::Appearance {
text_color: Some(Color::TRANSPARENT),
background: Some(Background::Color(
theme.cosmic().on_bg_color().into(),
)),
border: Border {
radius: 4.0.into(),
width: 0.0,
color: Color::TRANSPARENT,
},
shadow: Shadow::default(),
icon_color: Some(Color::TRANSPARENT),
},
)))
.into() .into()
}) })
.collect_vec(); .collect_vec();
let icon_wrapper: Element<_> = match applet.anchor {
PanelAnchor::Left => row(vec![column(dots).spacing(4).into(), cosmic_icon.into()]) let dots = if toplevels.is_empty() {
.align_items(iced::Alignment::Center) (0..1)
.spacing(4) .map(|_| {
.into(), container(vertical_space(Length::Fixed(0.0)))
PanelAnchor::Right => row(vec![cosmic_icon.into(), column(dots).spacing(4).into()]) .padding(dot_radius)
.align_items(iced::Alignment::Center) .into()
.spacing(4) })
.into(), .collect_vec()
PanelAnchor::Top => column(vec![row(dots).spacing(4).into(), cosmic_icon.into()]) } else {
.align_items(iced::Alignment::Center) (0..min(toplevels.len(), 3))
.spacing(4) .map(|_| {
.into(), container(vertical_space(Length::Fixed(0.0)))
PanelAnchor::Bottom => column(vec![cosmic_icon.into(), row(dots).spacing(4).into()]) .padding(dot_radius)
.align_items(iced::Alignment::Center) .style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
.spacing(4) |theme| container::Appearance {
.into(), text_color: Some(Color::TRANSPARENT),
background: Some(Background::Color(
theme.cosmic().on_bg_color().into(),
)),
border: Border {
radius: 4.0.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 {
PanelAnchor::Left => row(vec![
column(dots).spacing(4).into(),
cosmic_icon.into(),
column(dot_spacer).spacing(4).into(),
])
.align_items(iced::Alignment::Center)
.spacing(1)
.into(),
PanelAnchor::Right => row(vec![
column(dot_spacer).spacing(4).into(),
cosmic_icon.into(),
column(dots).spacing(4).into(),
])
.align_items(iced::Alignment::Center)
.spacing(1)
.into(),
PanelAnchor::Top => column(vec![
row(dots).spacing(4).into(),
cosmic_icon.into(),
row(dot_spacer).spacing(4).into(),
])
.align_items(iced::Alignment::Center)
.spacing(1)
.into(),
PanelAnchor::Bottom => column(vec![
row(dot_spacer).spacing(4).into(),
cosmic_icon.into(),
row(dots).spacing(4).into(),
])
.align_items(iced::Alignment::Center)
.spacing(1)
.into(),
};
let icon_button = match applet.anchor {
PanelAnchor::Left => cosmic::widget::button(icon_wrapper)
.style(Button::Text)
.padding([5, 0]),
PanelAnchor::Right => cosmic::widget::button(icon_wrapper)
.style(Button::Text)
.padding([5, 0]),
PanelAnchor::Top => cosmic::widget::button(icon_wrapper)
.style(Button::Text)
.padding([0, 5]),
PanelAnchor::Bottom => cosmic::widget::button(icon_wrapper)
.style(Button::Text)
.padding([0, 5]),
}; };
let icon_button = cosmic::widget::button(icon_wrapper)
.style(Button::Text)
.padding(8);
let icon_button = if interaction_enabled { let icon_button = if interaction_enabled {
dnd_source( dnd_source(
mouse_area( mouse_area(