From fd137f0c814722ec088b99b28d2b436af6b044bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=E1=BB=B3nh=20Thi=E1=BB=87n=20L=E1=BB=99c?=
 <huynhloc.contact@gmail.com>
Date: Fri, 30 Oct 2026 20:08:38 +0700
Subject: [PATCH] fix(widget-editor): show color picker above editor (#4021)

port 2.0
---
 quickshell/Modals/ColorPickerModal.qml                      | 6 ++++--
 quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/quickshell/Modals/ColorPickerModal.qml b/quickshell/Modals/ColorPickerModal.qml
index f145b9191..b35458ece 100644
--- a/quickshell/Modals/ColorPickerModal.qml
+++ b/quickshell/Modals/ColorPickerModal.qml
@@ -21,7 +21,8 @@ DModal {
     keepContentLoaded: true
     allowStacking: true
 
-    function show() {
+    function show(overlayLayer = false) {
+        useOverlayLayer = overlayLayer;
         open();
         contentLoader?.item?.setColor(selectedColor);
     }
@@ -54,6 +55,7 @@ DModal {
         if (contentLoader?.item?.pickingFromScreen)
             return;
         onColorSelectedCallback = null;
+        useOverlayLayer = false;
     }
     onColorSelected: color => {
         if (typeof onColorSelectedCallback === "function")
@@ -111,7 +113,7 @@ DModal {
                 root.hideInstant();
                 startScreenPick();
             }
-            onShowRequested: root.show()
+            onShowRequested: root.show(root.useOverlayLayer)
         }
     }
 }
diff --git a/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml b/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml
index 714fa958d..93901cd44 100644
--- a/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml
+++ b/quickshell/Modules/Settings/Widgets/SettingsColorPicker.qml
@@ -101,7 +101,7 @@ SettingsRow {
                             root.customColorSelected(selectedColor);
                             root.colorModeSelected("custom");
                         };
-                        PopoutService.colorPickerModal.show();
+                        PopoutService.colorPickerModal.show(true);
                     }
                 }
             }