Changeset 25948

Timestamp:

06/12/08 20:24:01 (5 months ago)

Author:

aldeck

Message:

- BMenu caches the preferred size (since r21396) but didn't recompute it if the ResizingMode changed, it did it only in
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)

Files:

• haiku/trunk/src/kits/interface/Menu.cpp (modified) (3 diffs)

haiku/trunk/src/kits/interface/Menu.cpp

@@ -174 +174 @@
 struct BMenu::LayoutData {
         BSize   preferred;
+        uint32  lastResizingMode;
 };
 
@@ -1854 +1855 @@
 BMenu::_ValidatePreferredSize()
 {
-        if (!fLayoutData->preferred.IsWidthSet())
+        if (!fLayoutData->preferred.IsWidthSet() || ResizingMode() != fLayoutData->lastResizingMode)            
                 _ComputeLayout(0, true, false, NULL, NULL);
 
@@ -1868 +1869 @@
         // Recalculate only the needed items,
         // not the whole layout every time
+        
+        fLayoutData->lastResizingMode = ResizingMode();
 
         BRect frame;