empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Check menu item visibility when calculating menu size.

Browse source
This commit is contained in:
Alex Hart 2020-04-09 10:48:11 -03:00 • committed by Greyson Parrelli
parent c6dd25a119
commit 2d60d5fb1f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java
View file

@ -61,7 +61,13 @@ public class AdaptiveActionsToolbar extends Toolbar {
} }
public static void adjustMenuActions(@NonNull Menu menu, int maxToShow, int toolbarWidthPx) { 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 widthAllowed = toolbarWidthPx - ViewUtil.dpToPx(NAVIGATION_DP);
int nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP)); int nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));