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

- BMenu caches the preferred size (since r21396) but didn't recompute it if the ResizingMode changed, it did it only in

Browse Source 
InvalidateLayout().

  This fixes #1461, the bug appeared because DraggableContainerIcon uses a special trick, involving changing the resizing 
mode, to get the total width of the menu items. (see tracker/ContainerWindow.cpp line 479)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25948 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner
2008-06-13 00:24:01 +00:00
parent fe83a98715
commit 709ef82757
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+4 -1
View File
@@ -173,6 +173,7 @@ const char *kEmptyMenuLabel = "<empty>";
struct BMenu::LayoutData { struct BMenu::LayoutData {
BSize preferred; BSize preferred;
uint32 lastResizingMode;
}; };
@@ -1853,7 +1854,7 @@ BMenu::_LayoutItems(int32 index)
BSize BSize
BMenu::_ValidatePreferredSize() BMenu::_ValidatePreferredSize()
{ {
if (!fLayoutData->preferred.IsWidthSet()) if (!fLayoutData->preferred.IsWidthSet() || ResizingMode() != fLayoutData->lastResizingMode)
_ComputeLayout(0, true, false, NULL, NULL); _ComputeLayout(0, true, false, NULL, NULL);
return fLayoutData->preferred; return fLayoutData->preferred;
@@ -1867,6 +1868,8 @@ BMenu::_ComputeLayout(int32 index, bool bestFit, bool moveItems,
// TODO: Take "bestFit", "moveItems", "index" into account, // TODO: Take "bestFit", "moveItems", "index" into account,
// Recalculate only the needed items, // Recalculate only the needed items,
// not the whole layout every time // not the whole layout every time
fLayoutData->lastResizingMode = ResizingMode();
BRect frame; BRect frame;