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

chore: update applet icon sizes

Browse source
This commit is contained in:
Ashley Wulber 2024-04-15 18:37:00 -04:00 • committed by Ashley Wulber
parent 08a334fc13
commit 8bf340aa8e
8 changed files with 297 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

450
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

11
Cargo.toml
View file

@ -21,17 +21,20 @@ resolver = "2"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0.81" anyhow = "1.0.81"
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "1cc4a13" } cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e4e6f8c" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
"client", "client",
], rev = "1cc4a13" } ], rev = "e4e6f8c" }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [ cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [
"libcosmic", "libcosmic",
"once_cell", "once_cell",
] } ] }
futures = "0.3" futures = "0.3"
futures-util = "0.3" futures-util = "0.3"
i18n-embed = { version = "0.14.1", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.14.1", features = [
"fluent-system",
"desktop-requester",
] }
i18n-embed-fl = "0.8" i18n-embed-fl = "0.8"
libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [
"applet", "applet",
@ -56,4 +59,4 @@ lto = "fat"
ignored = ["libcosmic"] ignored = ["libcosmic"]
[patch."https://github.com/Smithay/client-toolkit"] [patch."https://github.com/Smithay/client-toolkit"]
sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" } sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "3bed072" }

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

@ -48,6 +48,7 @@ use cosmic::theme::Button;
use cosmic::theme::Container; use cosmic::theme::Container;
use cosmic::widget::button; use cosmic::widget::button;
use cosmic::widget::divider; use cosmic::widget::divider;
use cosmic::widget::horizontal_space;
use cosmic::widget::rectangle_tracker::rectangle_tracker_subscription; use cosmic::widget::rectangle_tracker::rectangle_tracker_subscription;
use cosmic::widget::rectangle_tracker::RectangleTracker; use cosmic::widget::rectangle_tracker::RectangleTracker;
use cosmic::widget::rectangle_tracker::RectangleUpdate; use cosmic::widget::rectangle_tracker::RectangleUpdate;
@ -112,32 +113,38 @@ pub fn load_applications_for_app_ids_sorted<'a, 'b>(
struct AppletIconData { struct AppletIconData {
icon_size: u16, icon_size: u16,
icon_spacing: f32, icon_spacing: f32,
dot_size: f32, dot_radius: f32,
dot_spacing: f32, dot_spacing: f32,
padding: [u16; 2], padding: Padding,
} }
impl AppletIconData { impl AppletIconData {
fn new(applet: &Context) -> Self { fn new(applet: &Context) -> Self {
let suggested_size = applet.suggested_size().0; let icon_size = applet.suggested_size(false).0;
let (icon_size, icon_spacing, dot_size, dot_spacing, p_padding) = match applet.size { let padding = applet.suggested_padding(false);
Size::PanelSize(PanelSize::XL) => (10 + suggested_size, 0.0, 2.0, 4.0, 5),
Size::PanelSize(PanelSize::L) => (10 + suggested_size, 0.0, 2.0, 4.0, 5), let (icon_spacing, dot_radius, dot_spacing) = match applet.size {
Size::PanelSize(PanelSize::M) => (10 + suggested_size, 0.0, 2.0, 4.0, 5), Size::PanelSize(PanelSize::XL) => (0.0, 2.0, 4.0),
Size::PanelSize(PanelSize::S) => (16 + suggested_size, 0.0, 1.0, 2.0, 3), Size::PanelSize(PanelSize::L) | Size::PanelSize(PanelSize::M) | Size::Hardcoded(_) => {
Size::PanelSize(PanelSize::XS) => (8 + suggested_size, 0.0, 1.0, 2.0, 3), (0.0, 2.0, 4.0)
Size::Hardcoded(_) => (10 + suggested_size, 4.0, 0.0, 4.0, 5), }
Size::PanelSize(PanelSize::XS) | Size::PanelSize(PanelSize::S) => (0.0, 1.0, 2.0),
}; };
let padding = padding as f32;
let padding = match applet.anchor { let padding = match applet.anchor {
PanelAnchor::Bottom | PanelAnchor::Top => [0, p_padding], PanelAnchor::Top => [padding, padding, padding - (dot_radius * 2. + 1.), padding],
PanelAnchor::Left | PanelAnchor::Right => [p_padding, 0], PanelAnchor::Bottom => [padding - (dot_radius * 2. + 1.), padding, padding, padding],
PanelAnchor::Left => [padding, padding, padding, padding - (dot_radius * 2. + 1.)],
PanelAnchor::Right => [padding, padding - (dot_radius * 2. + 1.), padding, padding],
}; };
AppletIconData { AppletIconData {
icon_size, icon_size,
icon_spacing, icon_spacing,
dot_size, dot_radius,
dot_spacing, dot_spacing,
padding, padding: padding.into(),
} }
} }
} }
@ -185,6 +192,7 @@ impl DockItem {
interaction_enabled: bool, interaction_enabled: bool,
gpus: Option<&[Gpu]>, gpus: Option<&[Gpu]>,
is_focused: bool, is_focused: bool,
dot_border_radius: [f32; 4],
) -> Element<'_, Message> { ) -> Element<'_, Message> {
let Self { let Self {
toplevels, toplevels,
@ -197,19 +205,11 @@ impl DockItem {
let cosmic_icon = desktop_info.icon.as_cosmic_icon().size(app_icon.icon_size); let cosmic_icon = desktop_info.icon.as_cosmic_icon().size(app_icon.icon_size);
let dot_spacer = (0..1)
.map(|_| {
container(vertical_space(Length::Fixed(0.0)))
.padding(app_icon.dot_size)
.into()
})
.collect_vec();
let dots = if toplevels.is_empty() { let dots = if toplevels.is_empty() {
(0..1) (0..1)
.map(|_| { .map(|_| {
container(vertical_space(Length::Fixed(0.0))) container(vertical_space(Length::Fixed(0.0)))
.padding(app_icon.dot_size) .padding(app_icon.dot_radius)
.into() .into()
}) })
.collect_vec() .collect_vec()
@ -217,15 +217,15 @@ impl DockItem {
(0..min(toplevels.len(), 3)) (0..min(toplevels.len(), 3))
.map(|_| { .map(|_| {
container(vertical_space(Length::Fixed(0.0))) container(vertical_space(Length::Fixed(0.0)))
.padding(app_icon.dot_size) .padding(app_icon.dot_radius)
.style(<Theme as container::StyleSheet>::Style::Custom(Box::new( .style(<Theme as container::StyleSheet>::Style::Custom(Box::new(
|theme| container::Appearance { move |theme| container::Appearance {
text_color: Some(Color::TRANSPARENT), text_color: Some(Color::TRANSPARENT),
background: Some(Background::Color( background: Some(Background::Color(
theme.cosmic().on_bg_color().into(), theme.cosmic().on_bg_color().into(),
)), )),
border: Border { border: Border {
radius: 4.0.into(), radius: dot_border_radius.into(),
width: 0.0, width: 0.0,
color: Color::TRANSPARENT, color: Color::TRANSPARENT,
}, },
@ -241,35 +241,31 @@ impl DockItem {
let icon_wrapper: Element<_> = match applet.anchor { let icon_wrapper: Element<_> = match applet.anchor {
PanelAnchor::Left => row(vec![ PanelAnchor::Left => row(vec![
column(dots).spacing(app_icon.dot_spacing).into(), column(dots).spacing(app_icon.dot_spacing).into(),
horizontal_space(Length::Fixed(1.0)).into(),
cosmic_icon.into(), cosmic_icon.into(),
column(dot_spacer).spacing(app_icon.dot_spacing).into(),
]) ])
.align_items(iced::Alignment::Center) .align_items(iced::Alignment::Center)
.spacing(1)
.into(), .into(),
PanelAnchor::Right => row(vec![ PanelAnchor::Right => row(vec![
column(dot_spacer).spacing(app_icon.dot_spacing).into(),
cosmic_icon.into(), cosmic_icon.into(),
horizontal_space(Length::Fixed(1.0)).into(),
column(dots).spacing(app_icon.dot_spacing).into(), column(dots).spacing(app_icon.dot_spacing).into(),
]) ])
.align_items(iced::Alignment::Center) .align_items(iced::Alignment::Center)
.spacing(1)
.into(), .into(),
PanelAnchor::Top => column(vec![ PanelAnchor::Top => column(vec![
row(dots).spacing(app_icon.dot_spacing).into(), row(dots).spacing(app_icon.dot_spacing).into(),
vertical_space(Length::Fixed(1.0)).into(),
cosmic_icon.into(), cosmic_icon.into(),
row(dot_spacer).spacing(app_icon.dot_spacing).into(),
]) ])
.align_items(iced::Alignment::Center) .align_items(iced::Alignment::Center)
.spacing(1)
.into(), .into(),
PanelAnchor::Bottom => column(vec![ PanelAnchor::Bottom => column(vec![
row(dot_spacer).spacing(app_icon.dot_spacing).into(),
cosmic_icon.into(), cosmic_icon.into(),
vertical_space(Length::Fixed(1.0)).into(),
row(dots).spacing(app_icon.dot_spacing).into(), row(dots).spacing(app_icon.dot_spacing).into(),
]) ])
.align_items(iced::Alignment::Center) .align_items(iced::Alignment::Center)
.spacing(1)
.into(), .into(),
}; };
@ -898,7 +894,7 @@ impl cosmic::Application for CosmicAppList {
} }
} }
Message::DndEnter(x, y) => { Message::DndEnter(x, y) => {
let item_size = self.core.applet.suggested_size().0; let item_size = self.core.applet.suggested_size(false).0;
let pos_in_list = match self.core.applet.anchor { let pos_in_list = match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => x, PanelAnchor::Top | PanelAnchor::Bottom => x,
PanelAnchor::Left | PanelAnchor::Right => y, PanelAnchor::Left | PanelAnchor::Right => y,
@ -929,7 +925,7 @@ impl cosmic::Application for CosmicAppList {
} }
Message::DndMotion(x, y) => { Message::DndMotion(x, y) => {
if let Some(DndOffer { preview_index, .. }) = self.dnd_offer.as_mut() { if let Some(DndOffer { preview_index, .. }) = self.dnd_offer.as_mut() {
let item_size = self.core.applet.suggested_size().0; let item_size = self.core.applet.suggested_size(false).0;
let pos_in_list = match self.core.applet.anchor { let pos_in_list = match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => x, PanelAnchor::Top | PanelAnchor::Bottom => x,
PanelAnchor::Left | PanelAnchor::Right => y, PanelAnchor::Left | PanelAnchor::Right => y,
@ -1231,6 +1227,8 @@ impl cosmic::Application for CosmicAppList {
fn view(&self) -> Element<Message> { fn view(&self) -> Element<Message> {
let focused_item = self.currently_active_toplevel(); let focused_item = self.currently_active_toplevel();
let theme = self.core.system_theme();
let dot_radius = theme.cosmic().radius_xs();
let app_icon = AppletIconData::new(&self.core.applet); let app_icon = AppletIconData::new(&self.core.applet);
let is_horizontal = match self.core.applet.anchor { let is_horizontal = match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => true, PanelAnchor::Top | PanelAnchor::Bottom => true,
@ -1249,6 +1247,7 @@ impl cosmic::Application for CosmicAppList {
.toplevels .toplevels
.iter() .iter()
.any(|y| focused_item.contains(&y.0)), .any(|y| focused_item.contains(&y.0)),
theme.cosmic().radius_xs(),
) )
}) })
.collect(); .collect();
@ -1266,6 +1265,7 @@ impl cosmic::Application for CosmicAppList {
false, false,
self.gpus.as_deref(), self.gpus.as_deref(),
item.toplevels.iter().any(|y| focused_item.contains(&y.0)), item.toplevels.iter().any(|y| focused_item.contains(&y.0)),
dot_radius,
), ),
); );
} else if self.is_listening_for_dnd && self.favorite_list.is_empty() { } else if self.is_listening_for_dnd && self.favorite_list.is_empty() {
@ -1273,9 +1273,9 @@ impl cosmic::Application for CosmicAppList {
favorites.push( favorites.push(
container( container(
cosmic::widget::icon::from_name("starred-symbolic.symbolic") cosmic::widget::icon::from_name("starred-symbolic.symbolic")
.size(self.core.applet.suggested_size().0), .size(self.core.applet.suggested_size(false).0),
) )
.padding(8) .padding(self.core.applet.suggested_padding(false))
.into(), .into(),
); );
} }
@ -1293,6 +1293,7 @@ impl cosmic::Application for CosmicAppList {
.toplevels .toplevels
.iter() .iter()
.any(|y| focused_item.contains(&y.0)), .any(|y| focused_item.contains(&y.0)),
dot_radius,
) )
}) })
.collect(); .collect();
@ -1359,7 +1360,7 @@ impl cosmic::Application for CosmicAppList {
} else { } else {
vec![ vec![
cosmic::widget::icon::from_name("com.system76.CosmicAppList") cosmic::widget::icon::from_name("com.system76.CosmicAppList")
.size(self.core.applet.suggested_size().0) .size(self.core.applet.suggested_size(false).0)
.into(), .into(),
] ]
}; };
@ -1381,7 +1382,7 @@ impl cosmic::Application for CosmicAppList {
), ),
}; };
if self.active_list.is_empty() && self.favorite_list.is_empty() { if self.active_list.is_empty() && self.favorite_list.is_empty() {
let suggested_size = self.core.applet.suggested_size(); let suggested_size = self.core.applet.suggested_size(false);
content = content.width(suggested_size.0).height(suggested_size.1); content = content.width(suggested_size.0).height(suggested_size.1);
} }
if self.popup.is_some() { if self.popup.is_some() {
@ -1399,7 +1400,7 @@ impl cosmic::Application for CosmicAppList {
item.desktop_info item.desktop_info
.icon .icon
.as_cosmic_icon() .as_cosmic_icon()
.size(self.core.applet.suggested_size().0) .size(self.core.applet.suggested_size(false).0)
.into() .into()
} else if let Some((_popup_id, id, popup_type)) = self.popup.as_ref().filter(|p| id == p.0) } else if let Some((_popup_id, id, popup_type)) = self.popup.as_ref().filter(|p| id == p.0)
{ {
@ -1551,7 +1552,7 @@ impl cosmic::Application for CosmicAppList {
}, },
} }
} else { } else {
let suggested = self.core.applet.suggested_size(); let suggested = self.core.applet.suggested_size(false);
iced::widget::row!() iced::widget::row!()
.width(Length::Fixed(suggested.0 as f32)) .width(Length::Fixed(suggested.0 as f32))
.height(Length::Fixed(suggested.1 as f32)) .height(Length::Fixed(suggested.1 as f32))

2
cosmic-applet-minimize/src/lib.rs
View file

@ -124,7 +124,7 @@ impl cosmic::Application for Minimize {
} }
fn view(&self) -> Element<Message> { fn view(&self) -> Element<Message> {
let (width, _) = self.core.applet.suggested_size(); let (width, _) = self.core.applet.suggested_size(false);
let theme = self.core.system_theme().cosmic(); let theme = self.core.system_theme().cosmic();
let space_xxs = theme.space_xxs(); let space_xxs = theme.space_xxs();
let icon_buttons = self.apps.iter().map(|(handle, _, data, img)| { let icon_buttons = self.apps.iter().map(|(handle, _, data, img)| {

3
cosmic-applet-status-area/src/components/app.rs
View file

@ -49,7 +49,8 @@ impl App {
} }
fn resize_window(&self) -> Command<Msg> { fn resize_window(&self) -> Command<Msg> {
let icon_size = self.core.applet.suggested_size().0 as u32 + APPLET_PADDING * 2; let icon_size = self.core.applet.suggested_size(true).0 as u32
+ self.core.applet.suggested_padding(true) as u32 * 2;
let n = self.menus.len() as u32; let n = self.menus.len() as u32;
resize_window(window::Id::MAIN, 1.max(icon_size * n), icon_size) resize_window(window::Id::MAIN, 1.max(icon_size * n), icon_size)
} }

14
cosmic-applet-time/src/window.rs
View file

@ -249,8 +249,8 @@ impl cosmic::Application for Window {
row!( row!(
cosmic::widget::text(self.now.format(format).to_string()).size(14), cosmic::widget::text(self.now.format(format).to_string()).size(14),
container(vertical_space(Length::Fixed( container(vertical_space(Length::Fixed(
(self.core.applet.suggested_size().1 (self.core.applet.suggested_size(true).1
+ 2 * self.core.applet.suggested_padding()) + 2 * self.core.applet.suggested_padding(true))
as f32 as f32
))) )))
) )
@ -276,7 +276,7 @@ impl cosmic::Application for Window {
date_time_col = date_time_col.push( date_time_col = date_time_col.push(
// TODO better calendar icon? // TODO better calendar icon?
icon::from_name("calendar-go-today-symbolic") icon::from_name("calendar-go-today-symbolic")
.size(self.core.applet.suggested_size().0) .size(self.core.applet.suggested_size(true).0)
.symbolic(true), .symbolic(true),
); );
for d in self.now.format("%x").to_string().split('/') { for d in self.now.format("%x").to_string().split('/') {
@ -287,8 +287,8 @@ impl cosmic::Application for Window {
column!( column!(
date_time_col, date_time_col,
horizontal_space(Length::Fixed( horizontal_space(Length::Fixed(
(self.core.applet.suggested_size().0 (self.core.applet.suggested_size(true).0
+ 2 * self.core.applet.suggested_padding()) + 2 * self.core.applet.suggested_padding(true))
as f32 as f32
)) ))
) )
@ -296,9 +296,9 @@ impl cosmic::Application for Window {
) )
}) })
.padding(if horizontal { .padding(if horizontal {
[0, self.core.applet.suggested_padding()] [0, self.core.applet.suggested_padding(true)]
} else { } else {
[self.core.applet.suggested_padding(), 0] [self.core.applet.suggested_padding(true), 0]
}) })
.on_press(Message::TogglePopup) .on_press(Message::TogglePopup)
.style(cosmic::theme::Button::AppletIcon); .style(cosmic::theme::Button::AppletIcon);

12
cosmic-applet-workspaces/src/components/app.rs
View file

@ -138,8 +138,8 @@ impl cosmic::Application for IcedWorkspacesApplet {
let content = row!( let content = row!(
content, content,
vertical_space(Length::Fixed( vertical_space(Length::Fixed(
(self.core.applet.suggested_size().1 + 2 * self.core.applet.suggested_padding()) (self.core.applet.suggested_size(true).1
as f32 + 2 * self.core.applet.suggested_padding(true)) as f32
)) ))
) )
.align_items(cosmic::iced::Alignment::Center); .align_items(cosmic::iced::Alignment::Center);
@ -147,8 +147,8 @@ impl cosmic::Application for IcedWorkspacesApplet {
let content = column!( let content = column!(
content, content,
horizontal_space(Length::Fixed( horizontal_space(Length::Fixed(
(self.core.applet.suggested_size().0 + 2 * self.core.applet.suggested_padding()) (self.core.applet.suggested_size(true).0
as f32 + 2 * self.core.applet.suggested_padding(true)) as f32
)) ))
) )
.align_items(cosmic::iced::Alignment::Center); .align_items(cosmic::iced::Alignment::Center);
@ -159,9 +159,9 @@ impl cosmic::Application for IcedWorkspacesApplet {
.align_y(Vertical::Center), .align_y(Vertical::Center),
) )
.padding(if horizontal { .padding(if horizontal {
[0, self.core.applet.suggested_padding()] [0, self.core.applet.suggested_padding(true)]
} else { } else {
[self.core.applet.suggested_padding(), 0] [self.core.applet.suggested_padding(true), 0]
}) })
.on_press(match w.1 { .on_press(match w.1 {
Some(zcosmic_workspace_handle_v1::State::Active) => Message::WorkspaceOverview, Some(zcosmic_workspace_handle_v1::State::Active) => Message::WorkspaceOverview,

6
cosmic-panel-button/src/main.rs
View file

@ -67,13 +67,13 @@ impl cosmic::Application for Button {
let content = row!( let content = row!(
text(&self.desktop.name).size(14.0), text(&self.desktop.name).size(14.0),
vertical_space(Length::Fixed( vertical_space(Length::Fixed(
(self.core.applet.suggested_size().1 + 2 * self.core.applet.suggested_padding()) (self.core.applet.suggested_size(true).1
as f32 + 2 * self.core.applet.suggested_padding(true)) as f32
)) ))
) )
.align_items(iced::Alignment::Center); .align_items(iced::Alignment::Center);
cosmic::widget::button(content) cosmic::widget::button(content)
.padding([0, self.core.applet.suggested_padding()]) .padding([0, self.core.applet.suggested_padding(false)])
.style(cosmic::theme::Button::AppletIcon) .style(cosmic::theme::Button::AppletIcon)
} }
.on_press(Msg::Press) .on_press(Msg::Press)