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

@ -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,