i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shrink icon only width a bit to make room for more icons

Browse Source 
...before turning scrolling on.
This commit is contained in:
John Scipione
2012-11-12 22:03:24 -05:00
parent e4f9bfce33
commit 3135d0e0de
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/ExpandoMenuBar.cpp
+6 -8
View File
@@ -683,8 +683,9 @@ TExpandoMenuBar::CheckItemSizes(int32 delta)
int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize();
float iconOnlyWidth = kIconPadding + iconSize + kIconPadding;
float minItemWidth = fDrawLabel ? iconOnlyWidth + kMinMenuItemWidth
: iconOnlyWidth;
float maxItemWidth = sMinimumWindowWidth + iconSize - kMinimumIconSize;
: iconOnlyWidth - kIconPadding;
float maxItemWidth = fDrawLabel ? sMinimumWindowWidth + iconSize
- kMinimumIconSize : iconOnlyWidth;
float menuWidth = maxItemWidth * CountItems() + fDeskbarMenuWidth
+ kSepItemWidth;
@@ -716,13 +717,10 @@ TExpandoMenuBar::CheckItemSizes(int32 delta)
for (int32 index = 0; ; index++) {
TTeamMenuItem* item = (TTeamMenuItem*)ItemAt(index);
if (!item)
if (item == NULL)
break;
if (!fDrawLabel && newWidth > iconOnlyWidth)
item->SetOverrideWidth(iconOnlyWidth);
else
item->SetOverrideWidth(newWidth);
item->SetOverrideWidth(newWidth);
}
Invalidate();
@@ -803,7 +801,7 @@ TExpandoMenuBar::CheckForSizeOverrun()
int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize();
float iconOnlyWidth = kIconPadding + iconSize + kIconPadding;
float minItemWidth = fDrawLabel ? iconOnlyWidth + kMinMenuItemWidth
: iconOnlyWidth;
: iconOnlyWidth - kIconPadding;
float menuWidth = minItemWidth * CountItems() + fDeskbarMenuWidth
+ kSepItemWidth;
float maxWidth = fBarView->DragRegion()->Frame().left