From ee309161fdd9b11da58ccfe20663d1f68fc9b768 Mon Sep 17 00:00:00 2001
From: ajp_anton <ajp_anton@git.ajpanton.se>
Date: Mon, 22 Jun 2026 03:43:55 +0000
Subject: [PATCH] Prevent drawer overlay in wide settings mode

---
 .../statusbartweak/shell/ui/MainActivity.java         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/MainActivity.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/MainActivity.java
index 111a77b..7bb6481 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/MainActivity.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/MainActivity.java
@@ -13,6 +13,7 @@ import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.core.graphics.Insets;
 import androidx.core.view.GravityCompat;
 import androidx.core.view.ViewCompat;
@@ -318,13 +319,19 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 permanentNavigationView.setVisibility(View.VISIBLE);
                 drawerLayout.closeDrawer(GravityCompat.START, false);
             } else {
-                drawerNavigationView.setVisibility(View.VISIBLE);
                 drawerLayout.closeDrawer(GravityCompat.START, false);
                 permanentNavigationView.setVisibility(View.GONE);
-                drawerNavigationView.requestLayout();
             }
             drawerToggle.syncState();
         }
+        if (permanentSidebar) {
+            drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, GravityCompat.START);
+            drawerNavigationView.setVisibility(View.GONE);
+        } else {
+            drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, GravityCompat.START);
+            drawerNavigationView.setVisibility(View.VISIBLE);
+            drawerNavigationView.requestLayout();
+        }
         updateNavigationHeaderHeight(drawerNavigationView);
         updateNavigationHeaderHeight(permanentNavigationView);
         applyPageTitleVisibility();