From 13f21bf23b59a1751f012857d6a427b935e06628 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 2 Mar 2021 16:17:52 +0100
Subject: [PATCH] Port to use IconItem again

---
 .../taskpanel/package/contents/ui/Button.qml  |  6 ++-
 .../taskpanel/package/contents/ui/main.qml    | 53 +++----------------
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/containments/taskpanel/package/contents/ui/Button.qml b/containments/taskpanel/package/contents/ui/Button.qml
index 09f533e8..6f290968 100644
--- a/containments/taskpanel/package/contents/ui/Button.qml
+++ b/containments/taskpanel/package/contents/ui/Button.qml
@@ -20,6 +20,7 @@ Item {
     property MouseArea mouseArea
     readonly property bool pressed: mouseArea.pressed && mouseArea.activeButton == button
     property alias iconSource: icon.source
+    property alias colorGroup: icon.colorGroup
     signal clicked()
 
     Rectangle {
@@ -64,7 +65,10 @@ Item {
     }
     PlasmaCore.IconItem {
         id: icon
-        anchors.fill: parent
+        anchors {
+            fill: parent
+            margins: parent.height * 0.25
+        }
         colorGroup: PlasmaCore.ColorScope.colorGroup
         //enabled: button.enabled && button.clickable
     }
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index 230ff06b..878dbb61 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -169,17 +169,6 @@ PlasmaCore.ColorScope {
 
             visible: plasmoid.configuration.PanelButtonsVisible
             
-            PlasmaCore.Svg {
-                id: panelSvg
-                imagePath: "icons/mobile"
-                colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
-            }
-            PlasmaCore.Svg {
-                id: startSvg
-                imagePath: "icons/start"
-                colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
-            }
-            
             Rectangle {
                 anchors.fill: parent
                 gradient: Gradient {
@@ -211,18 +200,8 @@ PlasmaCore.ColorScope {
                     plasmoid.nativeInterface.showDesktop = false;
                     taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show();
                 }
-                PlasmaCore.SvgItem {
-                    anchors.centerIn: parent
-                    implicitHeight: 0.75 * parent.height * 0.6 // 0.75 sizing adjustment fix needed 
-                    implicitWidth: implicitHeight
-                    opacity: parent.enabled ? 1 : 0.5
-                    svg: panelSvg
-                    elementId: "mobile-task-switcher"
-                    
-                    Behavior on opacity {
-                        NumberAnimation { duration: units.shortDuration }
-                    }
-                }
+                iconSource: "mobile-task-switcher"
+                colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }
 
             Button {
@@ -243,18 +222,8 @@ PlasmaCore.ColorScope {
                     MobileShell.HomeScreenControls.resetHomeScreenPosition();
                     plasmoid.nativeInterface.allMinimizedChanged();
                 }
-                PlasmaCore.SvgItem {
-                    anchors.centerIn: parent
-                    implicitHeight: parent.height * 0.6
-                    implicitWidth: implicitHeight
-                    opacity: parent.enabled ? 1 : 0.5
-                    svg: startSvg
-                    elementId: "16-16-start-here-kde"
-                    
-                    Behavior on opacity {
-                        NumberAnimation { duration: units.shortDuration }
-                    }
-                }
+                iconSource: "start-here-kde"
+                colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }
 
             Button {
@@ -284,18 +253,8 @@ PlasmaCore.ColorScope {
                     }
                 }
 
-                PlasmaCore.SvgItem {
-                    anchors.centerIn: parent
-                    implicitHeight: 0.75 * parent.height * 0.6 // 0.75 sizing adjustment fix needed 
-                    implicitWidth: implicitHeight
-                    opacity: parent.enabled ? 1 : 0.5
-                    svg: panelSvg
-                    elementId: TaskPanel.KWinVirtualKeyboard.active ? "go-down" : "mobile-close-app"
-                    
-                    Behavior on opacity {
-                        NumberAnimation { duration: units.shortDuration }
-                    }
-                }
+                iconSource: TaskPanel.KWinVirtualKeyboard.active ? "go-down" : "mobile-close-app"
+                colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
             }
         }
     }