From d5b95d4eeef97527390363cb3a60271d1087952e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 12 Aug 2021 15:34:29 +0200
Subject: [PATCH] Make sure unpinning is possible

---
 app/src/main/java/eu/faircode/email/ActivityView.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 4f14e6f54b..e54379ab8c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -910,12 +910,14 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
     private int getDrawerWidth() {
         if (!nav_expanded)
-            return Helper.dp2pixels(this, 48);
+            return Helper.dp2pixels(this, 48); // One icon + padding
 
         DisplayMetrics dm = getResources().getDisplayMetrics();
         if (nav_pinned) {
-            int maxWidth = dm.widthPixels - Helper.dp2pixels(this, 300);
-            return Math.min(Helper.dp2pixels(this, 300), maxWidth);
+            int minWidth = Helper.dp2pixels(this, 72); // Make sure unpinning is possible
+            int dp300 = Helper.dp2pixels(this, 300);
+            int maxWidth = dm.widthPixels - dp300;
+            return Math.max(Math.min(dp300, maxWidth), minWidth);
         } else {
             int actionBarHeight;
             TypedValue tv = new TypedValue();