Optimize app name item

qml/main.qml

@@ -51,7 +51,7 @@ Item {
             Layout.fillHeight: true
             Layout.preferredWidth: acticityLayout.implicitWidth + FishUI.Units.largeSpacing
 
-            visible: acticityLabel.text
+            visible: acticity.title
             onClicked: acticityMenu.open()
 
             RowLayout {
@@ -61,39 +61,20 @@ Item {
                 anchors.rightMargin: FishUI.Units.smallSpacing
                 spacing: FishUI.Units.largeSpacing
 
-                FishUI.IconItem {
+                Image {
                     id: acticityIcon
-                    width: 22
+                    width: 16
-                    height: 22
+                    height: 16
-                    source: acticity.icon ? acticity.icon : ""
+                    sourceSize: Qt.size(width, height)
-                    visible: source !== ""
+                    source: acticity.icon ? "image://icontheme/" + acticity.icon : ""
+                    visible: status === Image.Ready
                 }
 
                 Label {
                     id: acticityLabel
                     text: acticity.title
-
-                    NumberAnimation {
-                        id: fadeInAni
-                        target: acticityLabel
-                        property: "opacity"
-                        duration: 250
-                        from: 0.0
-                        to: 1.0
-                    }
-
-                    onTextChanged: {
-                        fadeInAni.start()
                 }
             }
-
-//                Image {
-//                    width: 16
-//                    height: 16
-//                    sourceSize: Qt.size(width, height)
-//                    source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/down.svg" : "light/down.svg")
-//                }
-            }
         }
 
         Item {

src/activity.cpp

@@ -65,15 +65,14 @@ void Activity::onActiveWindowChanged()
         info.windowClassClass() == "cutefish-desktop" ||
         info.windowClassClass() == "cutefish-statusbar") {
         m_title.clear();
-        m_icon.clear();
         emit titleChanged();
-        emit iconChanged();
         return;
     }
 
     m_pid = info.pid();
     m_windowClass = info.windowClassClass().toLower();
 
+    if (!matchInfo()) {
         QString title = info.visibleName();
         if (title != m_title) {
             m_title = title;
@@ -81,11 +80,10 @@ void Activity::onActiveWindowChanged()
             m_icon.clear();
             emit iconChanged();
         }
-
+    }
-    matchInfo();
 }
 
-void Activity::matchInfo()
+bool Activity::matchInfo()
 {
     QString command = commandFromPid(m_pid);
 
@@ -121,9 +119,11 @@ void Activity::matchInfo()
             m_icon = desktop.value("Icon").toString();
             emit iconChanged();
 
-            break;
+            return true;
         }
     }
+
+    return false;
 }
 
 QString Activity::commandFromPid(quint32 pid)

src/activity.h

@@ -38,7 +38,7 @@ public:
 
 private slots:
     void onActiveWindowChanged();
-    void matchInfo();
+    bool matchInfo();
 
     QString commandFromPid(quint32 pid);