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

Merge branch 'master' into bulgarian

Browse source
This commit is contained in:
Jeremy Soller 2026-01-27 10:38:05 -07:00 • committed by GitHub
commit 055befb30a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
272 changed files with 4273 additions and 4972 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cosmic-app-list/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "cosmic-app-list"
version = "0.1.0"
version = "1.0.2"
edition = "2024"
license = "GPL-3.0-only"
@ -12,10 +12,9 @@ cosmic-protocols.workspace = true
futures.workspace = true
i18n-embed.workspace = true
i18n-embed-fl.workspace = true
image = { version = "0.25.8", default-features = false }
itertools = "0.14.0"
image = { version = "0.25.9", default-features = false }
libcosmic.workspace = true
memmap2 = "0.9.8"
memmap2 = "0.9.9"
fastrand = "2.3.0"
rust-embed.workspace = true
rustix.workspace = true
@ -25,5 +24,5 @@ tokio.workspace = true
tracing-log.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
url = "2.5.7"
url = "2.5.8"
zbus.workspace = true

2
cosmic-app-list/cosmic-app-list-config/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "cosmic-app-list-config"
version = "0.1.0"
version = "1.0.2"
edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

4
cosmic-app-list/cosmic-app-list-config/src/lib.rs
View file

@ -9,7 +9,7 @@ use std::fmt::Debug;
pub const APP_ID: &str = "com.system76.CosmicAppList";
#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq)]
pub enum TopLevelFilter {
pub enum ToplevelFilter {
#[default]
ActiveWorkspace,
ConfiguredOutput,
@ -18,7 +18,7 @@ pub enum TopLevelFilter {
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, CosmicConfigEntry)]
#[version = 1]
pub struct AppListConfig {
pub filter_top_levels: Option<TopLevelFilter>,
pub filter_top_levels: Option<ToplevelFilter>,
pub favorites: Vec<String>,
pub enable_drag_source: bool,
}

1
cosmic-app-list/data/com.system76.CosmicAppList.desktop
View file

@ -12,6 +12,7 @@ Name[nl]=App-Tray
Name[sk]=Panel aplikácií
Name[sv]=Programfält
Name[es]=Bandeja de aplicaciones
Name[it]=Area applicazioni
Type=Application
Exec=cosmic-app-list
Terminal=false

12
cosmic-app-list/i18n/ar/cosmic_app_list.ftl
View file

@ -1,8 +1,8 @@
cosmic-app-list = درج التطبيقات
pin = ثبت في درج التطبيقات
quit = إنهاء
quit-all = إنهاء الكل
pin = ثبِّت في درج التطبيقات
quit = أنهِ
quit-all = أنهِ الكل
new-window = نافذة جديدة
run = تشغيل
run-on = تشغيل على {$gpu}
run-on-default = (الافتراضي)
run = شغِّل
run-on = شغِّل على { $gpu }
run-on-default = (المبدئي)

4
cosmic-app-list/i18n/bg/cosmic_app_list.ftl
View file

@ -1,5 +1,5 @@
cosmic-app-list = Тава за програми
pin = Добавяне в тавата за програми
cosmic-app-list = Меню за програми
pin = Добавяне в менюто за програми
quit = Спиране на програмата
quit-all = Спиране на всички програми
new-window = Нов прозорец

0
cosmic-app-list/i18n/bn/cosmic_app_list.ftl Normal file
View file

4
cosmic-app-list/i18n/fr/cosmic_app_list.ftl
View file

@ -1,8 +1,8 @@
cosmic-app-list = Barre des applications
pin = Fixer à la barre
pin = Épingler à la barre d'applis
quit = Quitter
quit-all = Tout quitter
new-window = Nouvelle fenêtre
run = Lancer
run-on = Lancer avec {$gpu}
run-on = Lancer avec { $gpu }
run-on-default = (Défaut)

8
cosmic-app-list/i18n/ga/cosmic_app_list.ftl
View file

@ -1,8 +1,8 @@
cosmic-app-list = Tráidire Aipeanna
cosmic-app-list = Tráidire aipeanna
pin = Bioráin go tráidire aipeanna
quit = Scoir
quit-all = Scoir Uile
new-window = Fuinneog Nua
quit-all = Scoir uile
new-window = Fuinneog nua
run = Rith
run-on = Rith ar {$gpu}
run-on = Rith ar { $gpu }
run-on-default = (Réamhshocrú)

2
cosmic-app-list/i18n/hu/cosmic_app_list.ftl
View file

@ -4,5 +4,5 @@ quit = Kilépés
quit-all = Kilépés az összesből
new-window = Új ablak
run = Futtatás
run-on = Futtatás ezen: {$gpu}
run-on = Futtatás ezen: { $gpu }
run-on-default = (Alapértelmezett)

0
cosmic-app-list/i18n/ka/cosmic_app_list.ftl Normal file
View file

0
cosmic-app-list/i18n/kab/cosmic_app_list.ftl Normal file
View file

8
cosmic-app-list/i18n/kk/cosmic_app_list.ftl Normal file
View file

@ -0,0 +1,8 @@
quit = Шығу
run = Іске қосу
run-on = { $gpu } арқылы іске қосу
run-on-default = (Әдепкі)
cosmic-app-list = Қолданбалар сөресі
pin = Таңдамалыларға қосу
quit-all = Барлығының жұмысын аяқтау
new-window = Жаңа терезе

0
cosmic-app-list/i18n/kmr/cosmic_app_list.ftl Normal file
View file

7
cosmic-app-list/i18n/ko/cosmic_app_list.ftl
View file

@ -1,5 +1,8 @@
cosmic-app-list = 코스믹 독 앱 목록
cosmic-app-list = 앱 트레이
pin = 즐겨찾기
quit = 끝내기
quit = 종료
quit-all = 모두 끝내기
new-window = 새 창
run = 실행
run-on = { $gpu } 에서 실행
run-on-default = (기본값)

7
cosmic-app-list/i18n/lt/cosmic_app_list.ftl
View file

@ -0,0 +1,7 @@
new-window = Naujas Langas
quit = Išeiti
run = Paleisti
run-on = Paleisti naudojantis { $gpu }
run-on-default = (Numatytas)
cosmic-app-list = Aplikacijų Dėtuvė
pin = Prisegti prie aplikacijų dėtuvės

8
cosmic-app-list/i18n/nl/cosmic_app_list.ftl
View file

@ -1,8 +1,8 @@
cosmic-app-list = Toepassingsbalk
pin = Aan de toepassingsbalk vastmaken
quit = Toepassing sluiten
quit-all = Alles sluiten
quit = Beëindig
quit-all = Sluit alles
new-window = Nieuw venster
run = Uitvoeren
run-on = Op {$gpu} uitvoeren
run = Voer uit
run-on = Voer uit op { $gpu }
run-on-default = (Standaard)

0
cosmic-app-list/i18n/pa/cosmic_app_list.ftl Normal file
View file

2
cosmic-app-list/i18n/pt-BR/cosmic_app_list.ftl
View file

@ -1,5 +1,5 @@
cosmic-app-list = Bandeja de Aplicativos
pin = Fixar em aplicativos favoritos
pin = Fixar no painel
quit = Sair
quit-all = Sair de Todos
new-window = Nova Janela

0
cosmic-app-list/i18n/ti/cosmic_app_list.ftl Normal file
View file

6
cosmic-app-list/i18n/uk/cosmic_app_list.ftl
View file

@ -1,8 +1,8 @@
cosmic-app-list = Лоток застосунків
pin = Пришпилити до лотка застосунків
cosmic-app-list = Панель застосунків
pin = Пришпилити до панелі застосунків
quit = Вийти
quit-all = Закрити всі
new-window = Нове вікно
run = Запустити
run-on = Запустити на { $gpu }
run-on-default = (звичайній)
run-on-default = (звичайний)

8
cosmic-app-list/i18n/zh-CN/cosmic_app_list.ftl
View file

@ -1,8 +1,8 @@
cosmic-app-list = 应用托盘
pin = 固定
pin = 固定到应用托盘
quit = 退出
quit-all = 全部退出
new-window = 新窗口
new-window = 新建窗口
run = 运行
run-on = 在 {$gpu} 上运行
run-on-default = (Default)
run-on = 在 { $gpu } 上运行
run-on-default = （默认）

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

@ -19,8 +19,7 @@ use cctk::{
workspace::v1::client::ext_workspace_handle_v1::ExtWorkspaceHandleV1,
},
};
use cosmic::desktop::fde::unicase::Ascii;
use cosmic::desktop::fde::{self, DesktopEntry, get_languages_from_env};
use cosmic::desktop::fde::{self, DesktopEntry, get_languages_from_env, unicase::Ascii};
use cosmic::{
Apply, Element, Task, app,
applet::{
@ -30,14 +29,16 @@ use cosmic::{
cosmic_config::{Config, CosmicConfigEntry},
desktop::IconSourceExt,
iced::{
self, Limits, Subscription,
self, Alignment, Background, Border, Length, Limits, Padding, Subscription,
clipboard::mime::{AllowedMimeTypes, AsMimeTypes},
event::listen_with,
platform_specific::shell::commands::popup::{destroy_popup, get_popup},
widget::{Column, Row, column, mouse_area, row, vertical_rule, vertical_space},
widget::{
Column, Row, column, mouse_area, row, stack, text::Wrapping, vertical_rule,
vertical_space,
},
window,
},
iced_core::{Border, Padding},
iced_runtime::{core::event, dnd::peek_dnd},
surface,
theme::{self, Button, Container},
@ -52,7 +53,6 @@ use cosmic::{
use cosmic_app_list_config::{APP_ID, AppListConfig};
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::State;
use futures::future::pending;
use iced::{Alignment, Background, Length};
use rustc_hash::FxHashMap;
use std::{borrow::Cow, path::PathBuf, rc::Rc, str::FromStr, time::Duration};
use switcheroo_control::Gpu;
@ -79,8 +79,13 @@ static DND_FAVORITES: u64 = u64::MAX;
impl AppletIconData {
fn new(applet: &Context) -> Self {
let icon_size = applet.suggested_size(false).0;
let padding = applet.suggested_padding(false);
let icon_spacing = 4.0;
let (major_padding, cross_padding) = applet.suggested_padding(false);
let (h_padding, v_padding) = if applet.is_horizontal() {
(major_padding as f32, cross_padding as f32)
} else {
(cross_padding as f32, major_padding as f32)
};
let icon_spacing = applet.spacing as f32;
let (dot_radius, bar_size) = match applet.size {
Size::Hardcoded(_) => (2.0, 8.0),
@ -98,14 +103,31 @@ impl AppletIconData {
}
}
};
let padding = padding as f32;
let padding = match applet.anchor {
PanelAnchor::Top => [padding - (dot_radius * 2. + 1.), padding, padding, padding],
PanelAnchor::Bottom => [padding, padding, padding - (dot_radius * 2. + 1.), padding],
PanelAnchor::Left => [padding, padding, padding, padding - (dot_radius * 2. + 1.)],
PanelAnchor::Right => [padding, padding - (dot_radius * 2. + 1.), padding, padding],
PanelAnchor::Top => [
v_padding - (dot_radius * 2. + 1.),
h_padding,
v_padding,
h_padding,
],
PanelAnchor::Bottom => [
v_padding,
h_padding,
v_padding - (dot_radius * 2. + 1.),
h_padding,
],
PanelAnchor::Left => [
v_padding,
h_padding,
v_padding,
h_padding - (dot_radius * 2. + 1.),
],
PanelAnchor::Right => [
v_padding,
h_padding - (dot_radius * 2. + 1.),
v_padding,
h_padding,
],
};
AppletIconData {
icon_size,
@ -170,12 +192,13 @@ impl DockItem {
let app_icon = AppletIconData::new(applet);
let cosmic_icon = fde::IconSource::from_unknown(desktop_info.icon().unwrap_or_default())
.as_cosmic_icon()
// sets the preferred icon size variant
.size(128)
.width(app_icon.icon_size.into())
.height(app_icon.icon_size.into());
let cosmic_icon = cosmic::widget::icon(
fde::IconSource::from_unknown(desktop_info.icon().unwrap_or_default()).as_cosmic_icon(),
)
// sets the preferred icon size variant
.size(128)
.width(app_icon.icon_size.into())
.height(app_icon.icon_size.into());
let indicator = {
let container = if toplevels.len() <= 1 {
@ -257,7 +280,7 @@ impl DockItem {
.first()
.map(|t| Message::Toggle(t.0.foreign_toplevel.clone()))
} else {
Some(Message::TopLevelListPopup(*id, window_id))
Some(Message::ToplevelListPopup(*id, window_id))
})
.width(Length::Shrink)
.height(Length::Shrink),
@ -335,6 +358,7 @@ struct CosmicAppList {
active_workspaces: Vec<ExtWorkspaceHandleV1>,
output_list: FxHashMap<WlOutput, OutputInfo>,
locales: Vec<String>,
hovered_toplevel: Option<ExtForeignToplevelHandleV1>,
overflow_favorites_popup: Option<window::Id>,
overflow_active_popup: Option<window::Id>,
}
@ -342,7 +366,7 @@ struct CosmicAppList {
#[derive(Debug, Clone, PartialEq)]
pub enum PopupType {
RightClickMenu,
TopLevelList,
ToplevelList,
}
#[derive(Debug, Clone)]
@ -352,13 +376,15 @@ enum Message {
UnpinApp(u32),
Popup(u32, window::Id),
Pressed(window::Id),
TopLevelListPopup(u32, window::Id),
ToplevelListPopup(u32, window::Id),
ToplevelHoverChanged(ExtForeignToplevelHandleV1, bool),
GpuRequest(Option<Vec<Gpu>>),
CloseRequested(window::Id),
ClosePopup,
Activate(ExtForeignToplevelHandleV1),
Toggle(ExtForeignToplevelHandleV1),
Exec(String, Option<usize>, bool),
CloseToplevel(ExtForeignToplevelHandleV1),
Quit(String),
NewSeat(WlSeat),
RemovedSeat,
@ -435,58 +461,76 @@ async fn try_get_gpus() -> Option<Vec<Gpu>> {
Some(gpus)
}
const TOPLEVEL_BUTTON_WIDTH: f32 = 160.0;
const TOPLEVEL_BUTTON_HEIGHT: f32 = 130.0;
const TOPLEVEL_BUTTON_WIDTH: f32 = 192.0;
const TOPLEVEL_BUTTON_HEIGHT: f32 = 156.0;
pub fn toplevel_button<'a, Msg>(
fn toplevel_button<'a>(
img: Option<WaylandImage>,
on_press: Msg,
title: String,
handle: ExtForeignToplevelHandleV1,
is_focused: bool,
) -> cosmic::widget::Button<'a, Msg>
where
Msg: 'static + Clone,
{
is_hovered: bool,
) -> Element<'a, Message> {
let title = if title.len() > 22 {
format!("{:.20}...", title)
} else {
title
};
let border = 1.0;
button::custom(
container(
column![
container(if let Some(img) = img {
Element::from(Image::new(Handle::from_rgba(
img.width,
img.height,
img.img.clone(),
)))
} else {
Image::new(Handle::from_rgba(1, 1, [0u8, 0u8, 0u8, 255u8].as_slice())).into()
})
.class(Container::Custom(Box::new(move |theme| {
container::Style {
border: Border {
color: theme.cosmic().bg_divider().into(),
width: border,
radius: 0.0.into(),
},
..Default::default()
}
})))
.padding(border as u16)
.height(Length::Shrink)
.width(Length::Shrink)
.apply(container)
.center_y(Length::Fixed(90.0)),
text::body(title),
]
.spacing(4)
.align_x(Alignment::Center),
)
let preview = column![
container(if let Some(img) = img {
Element::from(Image::new(Handle::from_rgba(
img.width,
img.height,
img.img.clone(),
)))
} else {
Image::new(Handle::from_rgba(1, 1, [0u8, 0u8, 0u8, 255u8].as_slice())).into()
})
.class(Container::custom(move |theme| container::Style {
border: Border {
color: theme.cosmic().bg_divider().into(),
width: border,
radius: 1.0.into(),
},
..Default::default()
}))
.padding(border as u16)
.apply(container)
.center(Length::Fill),
)
.on_press(on_press)
.class(window_menu_style(is_focused))
.width(Length::Fixed(TOPLEVEL_BUTTON_WIDTH))
.height(Length::Fixed(TOPLEVEL_BUTTON_HEIGHT))
.selected(is_focused)
text::body(title)
.wrapping(Wrapping::None)
.width(Length::Fill)
.center()
]
.spacing(4)
.padding([4, 4, 0, 4]);
let close_button_overlay = if is_hovered {
row![
horizontal_space(),
button::custom(icon::from_name("window-close-symbolic").size(16))
.class(Button::Destructive)
.on_press(Message::CloseToplevel(handle.clone()))
.padding(4)
]
} else {
row![]
}
.width(Length::Fill)
.height(Length::Fill);
stack![preview, close_button_overlay]
.apply(button::custom)
.on_press(Message::Toggle(handle.clone()))
.class(window_menu_style(is_focused))
.width(Length::Fixed(TOPLEVEL_BUTTON_WIDTH))
.height(Length::Fixed(TOPLEVEL_BUTTON_HEIGHT))
.padding(4)
.selected(is_focused)
.apply(mouse_area)
.on_enter(Message::ToplevelHoverChanged(handle.clone(), true))
.on_exit(Message::ToplevelHoverChanged(handle, false))
.apply(Element::from)
}
fn window_menu_style(selected: bool) -> cosmic::theme::Button {
@ -567,7 +611,7 @@ fn app_list_icon_style(selected: bool) -> cosmic::theme::Button {
#[inline]
pub fn menu_control_padding() -> Padding {
let spacing = cosmic::theme::spacing();
let spacing = theme::spacing();
[spacing.space_xxs, spacing.space_s].into()
}
@ -605,6 +649,158 @@ impl CosmicAppList {
})
.collect();
}
/// Close any open popups.
fn close_popups(&mut self) -> Task<cosmic::Action<Message>> {
let mut commands = Vec::new();
if let Some(popup) = self.popup.take() {
commands.push(destroy_popup(popup.id));
}
if let Some(popup) = self.overflow_active_popup.take() {
commands.push(destroy_popup(popup));
}
if let Some(popup) = self.overflow_favorites_popup.take() {
commands.push(destroy_popup(popup));
}
Task::batch(commands)
}
/// Returns the length of the group in the favorite list after which items are displayed in a popup.
/// Shrink the favorite list until it only has active windows, or until it fits in the length provided.
fn panel_overflow_lengths(&self) -> (Option<usize>, Option<usize>) {
let mut favorite_index;
let mut active_index = None;
let Some(mut max_major_axis_len) = self.core.applet.suggested_bounds.as_ref().map(|c| {
// if we have a configure for width and height, we're in a overflow popup
match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => c.width as u32,
PanelAnchor::Left | PanelAnchor::Right => c.height as u32,
}
}) else {
return (None, active_index);
};
// tracing::error!("{} {}", max_major_axis_len, self.pinned_list.len());
// subtract the divider width
max_major_axis_len -= 1;
let applet_icon = AppletIconData::new(&self.core.applet);
let button_total_size = self.core.applet.suggested_size(true).0
+ self.core.applet.suggested_padding(true).0 * 2
+ applet_icon.icon_spacing as u16;
let favorite_active_cnt = self
.pinned_list
.iter()
.filter(|t| !t.toplevels.is_empty())
.count();
// initial calculation of favorite_index
let btn_count = max_major_axis_len / button_total_size as u32;
if btn_count >= self.pinned_list.len() as u32 + self.active_list.len() as u32 {
return (None, active_index);
} else {
favorite_index = (btn_count as usize).min(favorite_active_cnt).max(2);
}
// calculation of active_index based on favorite_index if there is still not enough space
let active_index_max = (btn_count as i32)
- (self.pinned_list.len() as i32).saturating_sub(favorite_index as i32);
if active_index_max >= self.active_list.len() as i32 {
active_index = Some(self.active_list.len());
} else {
active_index = Some((active_index_max.max(2) as usize).min(self.active_list.len()));
}
// final calculation of favorite_index if there is still not enough space
if let Some(active_index) = active_index {
let favorite_index_max = (btn_count as i32) - active_index as i32;
favorite_index = favorite_index_max.max(2) as usize;
} else {
favorite_index = (btn_count as usize).min(self.pinned_list.len());
}
// tracing::error!("{} {} {:?}", btn_count, favorite_index, active_index);
(Some(favorite_index), active_index)
}
fn currently_active_toplevel(&self) -> Vec<ExtForeignToplevelHandleV1> {
if self.active_workspaces.is_empty() {
return Vec::new();
}
let current_output = &self.core.applet.output_name;
let mut focused_toplevels: Vec<ExtForeignToplevelHandleV1> = Vec::new();
let active_workspaces = &self.active_workspaces;
for toplevel_list in self.active_list.iter().chain(self.pinned_list.iter()) {
for (t_info, _) in &toplevel_list.toplevels {
if t_info.state.contains(&State::Activated)
&& active_workspaces
.iter()
.any(|workspace| t_info.workspace.contains(workspace))
&& t_info.output.iter().any(|x| {
self.output_list.get(x).is_some_and(|val| {
val.name.as_ref().is_some_and(|n| n == current_output)
})
})
{
focused_toplevels.push(t_info.foreign_toplevel.clone());
}
}
}
focused_toplevels
}
fn find_desktop_entry_for_toplevel(
&mut self,
info: &ToplevelInfo,
unicase_appid: Ascii<&str>,
) -> DesktopEntry {
if let Some(appid) = fde::find_app_by_id(&self.desktop_entries, unicase_appid) {
appid.clone()
} else {
// Update desktop entries in case it was not found.
self.update_desktop_entries();
if let Some(appid) = fde::find_app_by_id(&self.desktop_entries, unicase_appid) {
appid.clone()
} else {
tracing::error!(id = info.app_id, "could not find desktop entry for app");
let mut fallback_entry = fde::DesktopEntry::from_appid(info.app_id.clone());
// proton opens games as steam_app_X, where X is either
// the steam appid or "default". games with a steam appid
// can have a desktop entry generated elsewhere; this
// specifically handles non-steam games opened
// under proton
// in addition, try to match WINE entries who have its
// appid = the full name of the executable (incl. .exe)
let is_proton_game = info.app_id == "steam_app_default";
if is_proton_game || info.app_id.ends_with(".exe") {
for entry in &self.desktop_entries {
let localised_name = entry.name(&self.locales).unwrap_or_default();
if localised_name == info.title {
// if this is a proton game, we only want
// to look for game entries
if is_proton_game
&& !entry.categories().unwrap_or_default().contains(&"Game")
{
continue;
}
fallback_entry = entry.clone();
break;
}
}
}
fallback_entry
}
}
}
// Check if a specific toplevel is focused
fn is_focused(&self, handle: &ExtForeignToplevelHandleV1) -> bool {
self.currently_active_toplevel().contains(handle)
}
// Check if a specific toplevel button is currently hovered
fn is_hovered(&self, handle: &ExtForeignToplevelHandleV1) -> bool {
self.hovered_toplevel.as_ref() == Some(handle)
}
}
impl cosmic::Application for CosmicAppList {
@ -709,7 +905,7 @@ impl cosmic::Application for CosmicAppList {
return Task::batch([gpu_update, get_popup(popup_settings)]);
}
}
Message::TopLevelListPopup(id, parent_window_id) => {
Message::ToplevelListPopup(id, parent_window_id) => {
if let Some(Popup {
parent,
id: popup_id,
@ -746,7 +942,7 @@ impl cosmic::Application for CosmicAppList {
parent: parent_window_id,
id: new_id,
dock_item: toplevel_group.clone(),
popup_type: PopupType::TopLevelList,
popup_type: PopupType::ToplevelList,
});
let mut popup_settings = self.core.applet.get_popup_settings(
@ -792,6 +988,14 @@ impl cosmic::Application for CosmicAppList {
return get_popup(popup_settings);
}
}
Message::ToplevelHoverChanged(handle, entering) => {
match (entering, &self.hovered_toplevel) {
(true, _) => self.hovered_toplevel = Some(handle),
// prevents race condition
(false, Some(h)) if h == &handle => self.hovered_toplevel = None,
_ => {}
}
}
Message::PinApp(id) => {
if let Some(i) = self.active_list.iter().position(|t| t.id == id) {
let entry = self.active_list.remove(i);
@ -833,18 +1037,21 @@ impl cosmic::Application for CosmicAppList {
}
Message::Toggle(handle) => {
if let Some(tx) = self.wayland_sender.as_ref() {
let _ = tx.send(WaylandRequest::Toplevel(
if self.currently_active_toplevel().contains(&handle) {
ToplevelRequest::Minimize(handle)
} else {
ToplevelRequest::Activate(handle)
},
));
let _ = tx.send(WaylandRequest::Toplevel(if self.is_focused(&handle) {
ToplevelRequest::Minimize(handle)
} else {
ToplevelRequest::Activate(handle)
}));
}
if let Some(p) = self.popup.take() {
return destroy_popup(p.id);
}
}
Message::CloseToplevel(handle) => {
if let Some(tx) = self.wayland_sender.as_ref() {
let _ = tx.send(WaylandRequest::Toplevel(ToplevelRequest::Quit(handle)));
}
}
Message::Quit(id) => {
if let Some(toplevel_group) = self
.active_list
@ -920,7 +1127,7 @@ impl cosmic::Application for CosmicAppList {
}
Message::DndEnter(x, y) => {
let item_size = self.core.applet.suggested_size(false).0
+ 2 * self.core.applet.suggested_padding(false);
+ 2 * self.core.applet.suggested_padding(false).0;
let pos_in_list = match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => x as f32,
PanelAnchor::Left | PanelAnchor::Right => y as f32,
@ -942,7 +1149,7 @@ impl cosmic::Application for CosmicAppList {
}
Message::DndMotion(x, y) => {
let item_size = self.core.applet.suggested_size(false).0
+ 2 * self.core.applet.suggested_padding(false);
+ 2 * self.core.applet.suggested_padding(false).0;
let pos_in_list = match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => x as f32,
PanelAnchor::Left | PanelAnchor::Right => y as f32,
@ -1122,6 +1329,21 @@ impl cosmic::Application for CosmicAppList {
.retain(|(info, _)| info.foreign_toplevel != handle);
}
self.active_list.retain(|t| !t.toplevels.is_empty());
if let Some(popup) = &mut self.popup
&& popup.popup_type == PopupType::ToplevelList
{
popup
.dock_item
.toplevels
.retain(|(info, _)| info.foreign_toplevel != handle);
if popup.dock_item.toplevels.is_empty() {
let id = popup.id;
self.popup = None;
return destroy_popup(id);
}
}
}
ToplevelUpdate::Update(info) => {
// TODO probably want to make sure it is removed
@ -1350,7 +1572,7 @@ impl cosmic::Application for CosmicAppList {
};
}
let applet_suggested_size = self.core.applet.suggested_size(false).0
+ 2 * self.core.applet.suggested_padding(false);
+ 2 * self.core.applet.suggested_padding(false).0;
let (_favorite_popup_cutoff, active_popup_cutoff) =
self.panel_overflow_lengths();
let popup_applet_count =
@ -1407,7 +1629,7 @@ impl cosmic::Application for CosmicAppList {
};
}
let applet_suggested_size = self.core.applet.suggested_size(false).0
+ 2 * self.core.applet.suggested_padding(false);
+ 2 * self.core.applet.suggested_padding(false).0;
let (favorite_popup_cutoff, _active_popup_cutoff) =
self.panel_overflow_lengths();
let popup_applet_count =
@ -1573,7 +1795,7 @@ impl cosmic::Application for CosmicAppList {
icon::from_name("starred-symbolic.symbolic")
.size(self.core.applet.suggested_size(false).0),
)
.padding(self.core.applet.suggested_padding(false))
.padding(self.core.applet.suggested_padding(false).1) // TODO
.into(),
);
}
@ -1643,13 +1865,13 @@ impl cosmic::Application for CosmicAppList {
let window_size = self.core.applet.suggested_bounds.as_ref();
let max_num = if self.core.applet.is_horizontal() {
let suggested_width = self.core.applet.suggested_size(false).0
+ self.core.applet.suggested_padding(false) * 2;
+ self.core.applet.suggested_padding(false).0 * 2;
window_size
.map(|w| w.width)
.map_or(u32::MAX, |b| (b / suggested_width as f32) as u32) as usize
} else {
let suggested_height = self.core.applet.suggested_size(false).1
+ self.core.applet.suggested_padding(false) * 2;
+ self.core.applet.suggested_padding(false).0 * 2;
window_size
.map(|w| w.height)
.map_or(u32::MAX, |b| (b / suggested_height as f32) as u32) as usize
@ -1756,10 +1978,12 @@ impl cosmic::Application for CosmicAppList {
let theme = self.core.system_theme();
if let Some((_, item, _, _)) = self.dnd_source.as_ref().filter(|s| s.0 == id) {
fde::IconSource::from_unknown(item.desktop_info.icon().unwrap_or_default())
.as_cosmic_icon()
.size(self.core.applet.suggested_size(false).0)
.into()
cosmic::widget::icon(
fde::IconSource::from_unknown(item.desktop_info.icon().unwrap_or_default())
.as_cosmic_icon(),
)
.size(self.core.applet.suggested_size(false).0)
.into()
} else if let Some(Popup {
dock_item: DockItem { id, .. },
popup_type,
@ -1787,7 +2011,7 @@ impl cosmic::Application for CosmicAppList {
content: impl Into<Element<'a, Message>>,
) -> cosmic::widget::Button<'a, Message> {
button::custom(content)
.height(20 + 2 * theme::active().cosmic().space_xxs())
.height(20 + 2 * theme::spacing().space_xxs)
.class(Button::MenuItem)
.padding(menu_control_padding())
.width(Length::Fill)
@ -1935,22 +2159,17 @@ impl cosmic::Application for CosmicAppList {
)
.into()
}
PopupType::TopLevelList => match self.core.applet.anchor {
PopupType::ToplevelList => match self.core.applet.anchor {
PanelAnchor::Left | PanelAnchor::Right => {
let mut content =
column![].padding(8).align_x(Alignment::Center).spacing(8);
for (info, img) in toplevels {
let title = if info.title.len() > 18 {
format!("{:.16}...", &info.title)
} else {
info.title.clone()
};
content = content.push(toplevel_button(
img.clone(),
Message::Toggle(info.foreign_toplevel.clone()),
title,
self.currently_active_toplevel()
.contains(&info.foreign_toplevel),
info.title.clone(),
info.foreign_toplevel.clone(),
self.is_focused(&info.foreign_toplevel),
self.is_hovered(&info.foreign_toplevel),
));
}
self.core
@ -1962,17 +2181,12 @@ impl cosmic::Application for CosmicAppList {
PanelAnchor::Bottom | PanelAnchor::Top => {
let mut content = row![].padding(8).align_y(Alignment::Center).spacing(8);
for (info, img) in toplevels {
let title = if info.title.len() > 18 {
format!("{:.16}...", &info.title)
} else {
info.title.clone()
};
content = content.push(toplevel_button(
img.clone(),
Message::Toggle(info.foreign_toplevel.clone()),
title,
self.currently_active_toplevel()
.contains(&info.foreign_toplevel),
info.title.clone(),
info.foreign_toplevel.clone(),
self.is_focused(&info.foreign_toplevel),
self.is_hovered(&info.foreign_toplevel),
));
}
self.core
@ -1993,44 +2207,46 @@ impl cosmic::Application for CosmicAppList {
let focused_item = self.currently_active_toplevel();
let dot_radius = theme.cosmic().radius_xs();
// show the overflow popup for active list
let active: Vec<_> =
self.active_list[..active_popup_cutoff.map_or(self.active_list.len(), |n| {
let active: Vec<_> = self
.active_list
.iter()
.rev()
.take(active_popup_cutoff.map_or(self.active_list.len(), |n| {
if n < self.active_list.len() {
n.saturating_sub(1)
self.active_list.len() - n + 1
} else {
n - 1
0
}
})]
.iter()
.map(|dock_item| {
self.core
.applet
.applet_tooltip(
dock_item.as_icon(
&self.core.applet,
self.rectangle_tracker.as_ref(),
self.popup.is_none(),
self.config.enable_drag_source,
self.gpus.as_deref(),
dock_item
.toplevels
.iter()
.any(|y| focused_item.contains(&y.0.foreign_toplevel)),
dot_radius,
self.core.main_window_id().unwrap(),
),
}))
.map(|dock_item| {
self.core
.applet
.applet_tooltip(
dock_item.as_icon(
&self.core.applet,
self.rectangle_tracker.as_ref(),
self.popup.is_none(),
self.config.enable_drag_source,
self.gpus.as_deref(),
dock_item
.desktop_info
.full_name(&self.locales)
.unwrap_or_default()
.into_owned(),
self.popup.is_some(),
Message::Surface,
None,
)
.into()
})
.collect();
.toplevels
.iter()
.any(|y| focused_item.contains(&y.0.foreign_toplevel)),
dot_radius,
id,
),
dock_item
.desktop_info
.full_name(&self.locales)
.unwrap_or_default()
.into_owned(),
self.popup.is_some(),
Message::Surface,
Some(id),
)
.into()
})
.collect();
let content = match &self.core.applet.anchor {
PanelAnchor::Left | PanelAnchor::Right => container(
Column::with_children(active)
@ -2212,155 +2428,6 @@ impl cosmic::Application for CosmicAppList {
}
}
impl CosmicAppList {
/// Close any open popups.
fn close_popups(&mut self) -> Task<cosmic::Action<Message>> {
let mut commands = Vec::new();
if let Some(popup) = self.popup.take() {
commands.push(destroy_popup(popup.id));
}
if let Some(popup) = self.overflow_active_popup.take() {
commands.push(destroy_popup(popup));
}
if let Some(popup) = self.overflow_favorites_popup.take() {
commands.push(destroy_popup(popup));
}
Task::batch(commands)
}
/// Returns the length of the group in the favorite list after which items are displayed in a popup.
/// Shrink the favorite list until it only has active windows, or until it fits in the length provided.
fn panel_overflow_lengths(&self) -> (Option<usize>, Option<usize>) {
let mut favorite_index;
let mut active_index = None;
let Some(mut max_major_axis_len) = self.core.applet.suggested_bounds.as_ref().map(|c| {
// if we have a configure for width and height, we're in a overflow popup
match self.core.applet.anchor {
PanelAnchor::Top | PanelAnchor::Bottom => c.width as u32,
PanelAnchor::Left | PanelAnchor::Right => c.height as u32,
}
}) else {
return (None, active_index);
};
// tracing::error!("{} {}", max_major_axis_len, self.pinned_list.len());
// subtract the divider width
max_major_axis_len -= 1;
let applet_icon = AppletIconData::new(&self.core.applet);
let button_total_size = self.core.applet.suggested_size(true).0
+ self.core.applet.suggested_padding(true) * 2
+ applet_icon.icon_spacing as u16;
let favorite_active_cnt = self
.pinned_list
.iter()
.filter(|t| !t.toplevels.is_empty())
.count();
// initial calculation of favorite_index
let btn_count = max_major_axis_len / button_total_size as u32;
if btn_count >= self.pinned_list.len() as u32 + self.active_list.len() as u32 {
return (None, active_index);
} else {
favorite_index = (btn_count as usize).min(favorite_active_cnt).max(2);
}
// calculation of active_index based on favorite_index if there is still not enough space
let active_index_max = (btn_count as i32)
- (self.pinned_list.len() as i32).saturating_sub(favorite_index as i32);
if active_index_max >= self.active_list.len() as i32 {
active_index = Some(self.active_list.len());
} else {
active_index = Some((active_index_max.max(2) as usize).min(self.active_list.len()));
}
// final calculation of favorite_index if there is still not enough space
if let Some(active_index) = active_index {
let favorite_index_max = (btn_count as i32) - active_index as i32;
favorite_index = favorite_index_max.max(2) as usize;
} else {
favorite_index = (btn_count as usize).min(self.pinned_list.len());
}
// tracing::error!("{} {} {:?}", btn_count, favorite_index, active_index);
(Some(favorite_index), active_index)
}
fn currently_active_toplevel(&self) -> Vec<ExtForeignToplevelHandleV1> {
if self.active_workspaces.is_empty() {
return Vec::new();
}
let current_output = &self.core.applet.output_name;
let mut focused_toplevels: Vec<ExtForeignToplevelHandleV1> = Vec::new();
let active_workspaces = &self.active_workspaces;
for toplevel_list in self.active_list.iter().chain(self.pinned_list.iter()) {
for (t_info, _) in &toplevel_list.toplevels {
if t_info.state.contains(&State::Activated)
&& active_workspaces
.iter()
.any(|workspace| t_info.workspace.contains(workspace))
&& t_info.output.iter().any(|x| {
self.output_list.get(x).is_some_and(|val| {
val.name.as_ref().is_some_and(|n| n == current_output)
})
})
{
focused_toplevels.push(t_info.foreign_toplevel.clone());
}
}
}
focused_toplevels
}
fn find_desktop_entry_for_toplevel(
&mut self,
info: &ToplevelInfo,
unicase_appid: Ascii<&str>,
) -> DesktopEntry {
if let Some(appid) = fde::find_app_by_id(&self.desktop_entries, unicase_appid) {
appid.clone()
} else {
// Update desktop entries in case it was not found.
self.update_desktop_entries();
if let Some(appid) = fde::find_app_by_id(&self.desktop_entries, unicase_appid) {
appid.clone()
} else {
tracing::error!(id = info.app_id, "could not find desktop entry for app");
let mut fallback_entry = fde::DesktopEntry::from_appid(info.app_id.clone());
// proton opens games as steam_app_X, where X is either
// the steam appid or "default". games with a steam appid
// can have a desktop entry generated elsewhere; this
// specifically handles non-steam games opened
// under proton
// in addition, try to match WINE entries who have its
// appid = the full name of the executable (incl. .exe)
let is_proton_game = info.app_id == "steam_app_default";
if is_proton_game || info.app_id.ends_with(".exe") {
for entry in &self.desktop_entries {
let localised_name = entry.name(&self.locales).unwrap_or_default();
if localised_name == info.title {
// if this is a proton game, we only want
// to look for game entries
if is_proton_game
&& !entry.categories().unwrap_or_default().contains(&"Game")
{
continue;
}
fallback_entry = entry.clone();
break;
}
}
}
fallback_entry
}
}
}
}
fn launch_on_preferred_gpu(desktop_info: &DesktopEntry, gpus: Option<&[Gpu]>) -> Option<Message> {
let exec = desktop_info.exec()?;

4
cosmic-app-list/src/wayland_handler.rs
View file

@ -506,9 +506,9 @@ impl AppData {
return;
};
// resize to 128x128
// resize to 256x256
let max = img.width().max(img.height());
let ratio = max as f32 / 128.0;
let ratio = max as f32 / 256.0;
let img = if ratio > 1.0 {
let new_width = (img.width() as f32 / ratio).round();