Check menu item visibility when calculating menu size.

signalapp · Apr 21, 2020 · 2d60d5f · 2d60d5f
1 parent c6dd25a
commit 2d60d5f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java
@@ -61,7 +61,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
   }
 
   public static void adjustMenuActions(@NonNull Menu menu, int maxToShow, int toolbarWidthPx) {
-    int menuSize = menu.size();
+    int menuSize = 0;
+
+    for (int i = 0; i < menu.size(); i++) {
+      if (menu.getItem(i).isVisible()) {
+        menuSize++;
+      }
+    }
 
     int widthAllowed = toolbarWidthPx - ViewUtil.dpToPx(NAVIGATION_DP);
     int nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));