From 117d68749be0b86921a403b6450398380f2464be Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 17 May 2021 22:00:53 +0300
Subject: [PATCH] plasmoid:fix monochromized icons implementation

---
 .../abilities/items/BasicItem.qml             |  1 +
 .../items/basicitem/ParabolicItem.qml         | 26 +++++++++----------
 .../package/contents/ui/task/TaskIcon.qml     |  2 ++
 .../package/contents/ui/task/TaskItem.qml     |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/declarativeimports/abilities/items/BasicItem.qml b/declarativeimports/abilities/items/BasicItem.qml
index 998a56c70..21fa018a5 100644
--- a/declarativeimports/abilities/items/BasicItem.qml
+++ b/declarativeimports/abilities/items/BasicItem.qml
@@ -106,6 +106,7 @@ Item{
 
     property Item abilities: null
     property Item contentItem: null
+    property Item monochromizedItem: null
 
     readonly property bool isHorizontal: !isVertical
     readonly property bool isVertical: plasmoid.formFactor === PlasmaCore.Types.Vertical
diff --git a/declarativeimports/abilities/items/basicitem/ParabolicItem.qml b/declarativeimports/abilities/items/basicitem/ParabolicItem.qml
index 01d226e2b..2bef5fe62 100644
--- a/declarativeimports/abilities/items/basicitem/ParabolicItem.qml
+++ b/declarativeimports/abilities/items/basicitem/ParabolicItem.qml
@@ -190,21 +190,21 @@ Item{
                     }
                 }
             }
-
-            //! Latte Side Painting-style if the user chose it
-            Loader{
-                anchors.fill: _contentItemContainer
-                active: abilityItem.isMonochromaticForcedContentItem
-
-                sourceComponent: ColorOverlay {
-                    anchors.fill: parent
-                    color: latteBridge ? latteBridge.palette.textColor : "transparent"
-                    source: _contentItemContainer.contentItem
-                }
-            }
-            //! Latte Side Painting-style if the user chose it
         } //_contentItemContainer
 
+        //! Latte Side Painting-style if the user chose it
+        Loader{
+            anchors.fill: _contentItemContainer
+            active: abilityItem.isMonochromaticForcedContentItem && abilityItem.monochromizedItem
+
+            sourceComponent: ColorOverlay {
+                anchors.fill: parent
+                color: latteBridge ? latteBridge.palette.textColor : "transparent"
+                source: abilityItem.monochromizedItem
+            }
+        }
+        //! Latte Side Painting-style if the user chose it
+
         ShortcutBadge{
             id: shortcutBadge
             anchors.centerIn: parent
diff --git a/plasmoid/package/contents/ui/task/TaskIcon.qml b/plasmoid/package/contents/ui/task/TaskIcon.qml
index 782c574fd..a619d8126 100644
--- a/plasmoid/package/contents/ui/task/TaskIcon.qml
+++ b/plasmoid/package/contents/ui/task/TaskIcon.qml
@@ -45,6 +45,8 @@ Item {
     readonly property real progress: smartLauncherItem && smartLauncherItem.progress ? smartLauncherItem.progress : 0
     readonly property QtObject smartLauncherItem: smartLauncherLoader.active ? smartLauncherLoader.item : null
 
+    readonly property Item monochromizedItem: badgesLoader.active ? badgesLoader.item : taskIconItem
+
     Rectangle{
         id: draggedRectangle
         width: parent.width + 2
diff --git a/plasmoid/package/contents/ui/task/TaskItem.qml b/plasmoid/package/contents/ui/task/TaskItem.qml
index 5fc2b4e66..6229bea6a 100644
--- a/plasmoid/package/contents/ui/task/TaskItem.qml
+++ b/plasmoid/package/contents/ui/task/TaskItem.qml
@@ -50,6 +50,7 @@ AbilityItem.BasicItem {
                             || (taskItem.containsMouse && inAttentionAnimation && taskItem.parabolicItem.zoom!==taskItem.abilities.parabolic.factor.zoom)
 
     isMonochromaticForcedContentItem: plasmoid.configuration.forceMonochromaticIcons
+    monochromizedItem: taskIcon.monochromizedItem
 
     isSeparatorHidden: isSeparator && (lastValidIndex > taskItem.abilities.indexer.lastVisibleItemIndex)
     isSeparatorInRealLength: isSeparator && root.dragSource