From 4a86ad8c06609693758f3917580fe739163d84f4 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Fri, 1 Nov 2024 15:41:57 -0700
Subject: [PATCH] actiondrawer: Cleanup and simplify

Make sure that the view colorset is correct, remove unnecessary layer
(clip is enabled), and remove unnecessary visibility hack for the
notifications widget.
---
 components/mobileshell/qml/actiondrawer/ContentContainer.qml   | 3 +++
 .../mobileshell/qml/actiondrawer/PortraitContentContainer.qml  | 3 ---
 .../qml/actiondrawer/quicksettings/QuickSettings.qml           | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/mobileshell/qml/actiondrawer/ContentContainer.qml b/components/mobileshell/qml/actiondrawer/ContentContainer.qml
index 7de35f8d..fe0f0d92 100644
--- a/components/mobileshell/qml/actiondrawer/ContentContainer.qml
+++ b/components/mobileshell/qml/actiondrawer/ContentContainer.qml
@@ -27,6 +27,9 @@ Rectangle {
         return Math.max(0, Math.min(1, val));
     }
 
+    Kirigami.Theme.colorSet: Kirigami.Theme.View
+    Kirigami.Theme.inherit: false
+
     // Background color
     color: Qt.rgba(Kirigami.Theme.backgroundColor.r,
                     Kirigami.Theme.backgroundColor.g,
diff --git a/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml b/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml
index 250dd9e3..c4f2e26c 100644
--- a/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml
+++ b/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml
@@ -93,8 +93,5 @@ Item {
             right: parent.right
         }
         opacity: applyMinMax(root.actionDrawer.offset / root.minimizedQuickSettingsOffset)
-
-        // HACK: there are weird issues with text rendering black regardless of opacity, just set the text to be invisible once it's out
-        visible: opacity > 0.05
     }
 }
diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettings.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettings.qml
index 630c75b8..211bcc27 100644
--- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettings.qml
+++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettings.qml
@@ -20,7 +20,6 @@ import org.kde.kirigami 2.20 as Kirigami
  */
 Item {
     id: root
-    layer.enabled: true
     clip: true
 
     required property var actionDrawer