Changeset 17356

Timestamp:

05/07/06 15:58:07 (3 years ago)

Author:

jackburton

Message:

BMenu::InvalidateLayout() should only sets a variable, the real invalidation is done on Draw() or AttachedToWindow() (like on R5). This fixes bug 567 (at least the crash in HotEdit)

Files:

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

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

@@ -285 +285 @@
         }
 
-        if (!fAttachAborted)
-                InvalidateLayout();
+        if (!fAttachAborted) {
+                CacheFontInfo();
+                LayoutItems(0); 
+        }
 }
 
@@ -743 +745 @@
 BMenu::Draw(BRect updateRect)
 {
+        if (!fUseCachedMenuLayout) {
+                fUseCachedMenuLayout = true;
+                CacheFontInfo();
+                LayoutItems(0);
+                Invalidate();
+                return;
+        }
+
         DrawBackground(updateRect);
         DrawItems(updateRect);
@@ -779 +789 @@
 BMenu::InvalidateLayout()
 {
-        CacheFontInfo();
-        LayoutItems(0);
-        Invalidate();
+        fUseCachedMenuLayout = false;
 }