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

app-list: modify more sizing variables based on panel size

Browse source
This commit is contained in:
Ryan Brue 2024-04-03 15:13:17 -05:00 • committed by Ashley Wulber
parent 9922dfa0db
commit 3c74e433dd
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,8 @@ use cctk::sctk::reexports::calloop::channel::Sender;
use cctk::toplevel_info::ToplevelInfo; use cctk::toplevel_info::ToplevelInfo;
use cctk::wayland_client::protocol::wl_data_device_manager::DndAction; use cctk::wayland_client::protocol::wl_data_device_manager::DndAction;
use cctk::wayland_client::protocol::wl_seat::WlSeat; use cctk::wayland_client::protocol::wl_seat::WlSeat;
use cosmic::applet::cosmic_panel_config::PanelSize;
use cosmic::applet::Size;
use cosmic::cosmic_config::{Config, CosmicConfigEntry}; use cosmic::cosmic_config::{Config, CosmicConfigEntry};
use cosmic::desktop::{ use cosmic::desktop::{
app_id_or_fallback_matches, load_applications_for_app_ids, DesktopEntryData, app_id_or_fallback_matches, load_applications_for_app_ids, DesktopEntryData,
@ -154,12 +156,19 @@ impl DockItem {
.. ..
} = self; } = self;
let cosmic_icon = desktop_info let (app_icon_size_modifier, dot_radius, p_padding) = match applet.size {
.icon Size::PanelSize(PanelSize::XL) => (10, 2.0, 5),
.as_cosmic_icon() Size::PanelSize(PanelSize::L) => (10, 2.0, 5),
.size(applet.suggested_size().0 + 6); Size::PanelSize(PanelSize::M) => (10, 2.0, 5),
Size::PanelSize(PanelSize::S) => (16, 1.0, 3),
Size::PanelSize(PanelSize::XS) => (8, 1.0, 3),
Size::Hardcoded(_) => (10, 2.0, 5),
};
let app_icon_size = applet.suggested_size().0 + app_icon_size_modifier;
let cosmic_icon = desktop_info.icon.as_cosmic_icon().size(app_icon_size);
let dot_radius = 2;
let dot_spacer = (0..1) let dot_spacer = (0..1)
.map(|_| { .map(|_| {
container(vertical_space(Length::Fixed(0.0))) container(vertical_space(Length::Fixed(0.0)))
@ -239,16 +248,16 @@ impl DockItem {
let icon_button = match applet.anchor { let icon_button = match applet.anchor {
PanelAnchor::Left => cosmic::widget::button(icon_wrapper) PanelAnchor::Left => cosmic::widget::button(icon_wrapper)
.style(Button::Text) .style(Button::Text)
.padding([5, 0]), .padding([p_padding, 0]),
PanelAnchor::Right => cosmic::widget::button(icon_wrapper) PanelAnchor::Right => cosmic::widget::button(icon_wrapper)
.style(Button::Text) .style(Button::Text)
.padding([5, 0]), .padding([p_padding, 0]),
PanelAnchor::Top => cosmic::widget::button(icon_wrapper) PanelAnchor::Top => cosmic::widget::button(icon_wrapper)
.style(Button::Text) .style(Button::Text)
.padding([0, 5]), .padding([0, p_padding]),
PanelAnchor::Bottom => cosmic::widget::button(icon_wrapper) PanelAnchor::Bottom => cosmic::widget::button(icon_wrapper)
.style(Button::Text) .style(Button::Text)
.padding([0, 5]), .padding([0, p_padding]),
} }
.selected(is_focused) .selected(is_focused)
.style(app_list_icon_style(is_focused)); .style(app_list_icon_style(is_focused));