From c873dffce88e6ed261f5bc28296be48e22b4c275 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Sat, 10 Dec 2022 22:05:25 -0500
Subject: [PATCH] homescreen: Fix bottom margin in gesture mode

---
 .../qml/actiondrawer/LandscapeContentContainer.qml   | 12 ------------
 components/mobileshell/qml/homescreen/HomeScreen.qml |  3 ++-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml
index 5128afc7..ca68b1be 100644
--- a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml
+++ b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml
@@ -69,9 +69,6 @@ PlasmaCore.ColorScope {
             opacity: opacityValue
             spacing: 0
             
-            // 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
-            
             anchors {
                 top: mediaWidget.bottom
                 topMargin: 0
@@ -114,9 +111,6 @@ PlasmaCore.ColorScope {
             verticalAlignment: Qt.AlignVCenter
             opacity: columnLayout.opacity
             
-            // 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
-            
             anchors {
                 left: parent.left
                 top: parent.top
@@ -136,9 +130,6 @@ PlasmaCore.ColorScope {
             color: PlasmaCore.ColorScope.disabledTextColor
             opacity: columnLayout.opacity
             
-            // 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
-
             anchors {
                 left: parent.left
                 top: clock.bottom
@@ -158,9 +149,6 @@ PlasmaCore.ColorScope {
             y: isOnLargeScreen ? date.y - height + date.implicitHeight : date.y + date.implicitHeight + columnLayout.anchors.margins / 2
             
             opacity: columnLayout.opacity
-            
-            // 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
                         
             anchors {
                 right: quickSettings.left
diff --git a/components/mobileshell/qml/homescreen/HomeScreen.qml b/components/mobileshell/qml/homescreen/HomeScreen.qml
index 3a3e3d51..ffc03138 100644
--- a/components/mobileshell/qml/homescreen/HomeScreen.qml
+++ b/components/mobileshell/qml/homescreen/HomeScreen.qml
@@ -56,7 +56,8 @@ Item {
 
     function evaluateMargins() {
         topMargin = plasmoid.availableScreenRect.y
-        bottomMargin = root.height - (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height)
+        // add a specific check for the nav panel for now, since the gesture mode still technically has height
+        bottomMargin = MobileShell.MobileShellSettings.navigationPanelEnabled ? root.height - (plasmoid.availableScreenRect.y + plasmoid.availableScreenRect.height) : 0;
         leftMargin = plasmoid.availableScreenRect.x
         rightMargin = root.width - (plasmoid.availableScreenRect.x + plasmoid.availableScreenRect.width)
     }