Merge branch 'master' into tobsch/app-list-filtering

This commit is contained in:
Levi Portenier 2026-01-22 15:27:15 -07:00 committed by GitHub
commit 80836cb941
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
86 changed files with 1849 additions and 2234 deletions

View file

@ -1,6 +1,6 @@
[package]
name = "cosmic-app-list"
version = "1.0.0"
version = "1.0.2"
edition = "2024"
license = "GPL-3.0-only"
@ -24,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

View file

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

View file

@ -11,6 +11,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

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 = (默认)

View file

@ -203,12 +203,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 toplevel_count <= 1 {
@ -2037,10 +2038,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,