From 3135d0e0de20e432df89b42d02fde4993c1d9bbf Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sat, 27 Oct 2012 19:11:49 -0400 Subject: [PATCH] Shrink icon only width a bit to make room for more icons ...before turning scrolling on. --- src/apps/deskbar/ExpandoMenuBar.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index d44fc069daa..529a44446dd 100644 --- a/src/apps/deskbar/ExpandoMenuBar.cpp +++ b/src/apps/deskbar/ExpandoMenuBar.cpp @@ -683,8 +683,9 @@ TExpandoMenuBar::CheckItemSizes(int32 delta) int32 iconSize = static_cast(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(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