Use XdgIcon::fromTheme(...) instead of own implementation

LXQt-Marcus-Fork · Mar 28, 2024 · 41ee2b2 · 41ee2b2
1 parent 565567f
commit 41ee2b2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 161 deletions.
diff --git a/panel/backends/wayland/wlroots/CMakeLists.txt b/panel/backends/wayland/wlroots/CMakeLists.txt
@@ -8,12 +8,10 @@ add_library(lxqt-panel-backend-wlroots STATIC
     lxqttaskbarbackendwlr.h
     lxqttaskbarwlrwindowmanagment.h
     lxqtwlrvirtualdesktop.h
-    icontools.hpp
 
     lxqttaskbarbackendwlr.cpp
     lxqttaskbarwlrwindowmanagment.cpp
     lxqtwlrvirtualdesktop.cpp
-    icontools.cpp
 )
 
 qt6_generate_wayland_protocol_client_sources(lxqt-panel-backend-wlroots

diff --git a/panel/backends/wayland/wlroots/icontools.cpp b/panel/backends/wayland/wlroots/icontools.cpp
diff --git a/panel/backends/wayland/wlroots/icontools.hpp b/panel/backends/wayland/wlroots/icontools.hpp
diff --git a/panel/backends/wayland/wlroots/lxqttaskbarwlrwindowmanagment.cpp b/panel/backends/wayland/wlroots/lxqttaskbarwlrwindowmanagment.cpp
@@ -1,5 +1,4 @@
 #include "lxqttaskbarwlrwindowmanagment.h"
-#include "icontools.hpp"
 
 #include <QString>
 #include <QFuture>
@@ -12,7 +11,7 @@
 #include <QWaylandClientExtension>
 #include <QWindow>
 
-#include <xdgdesktopfile.h>
+#include <xdgicon.h>
 
 #include <qpa/qplatformnativeinterface.h>
 
@@ -98,7 +97,11 @@ void LXQtTaskBarWlrootsWindow::zwlr_foreign_toplevel_handle_v1_app_id(const QStr
     appIdRecieved = true;
     emit appIdChanged();
 
-    this->icon = getIconForAppId( app_id );
+    this->icon = XdgIcon::fromTheme(appId);
+    if ( this->icon.pixmap(64).width() == 0 )
+    {
+        this->icon = XdgIcon::fromTheme(appId.toLower());
+    }
 
     if ( appIdRecieved && titleRecieved )
     {