From 73f99cd6aef6ac3d539e4191e4bb7819d8d0c63e Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Fri, 26 May 2006 17:28:18 +0000 Subject: [PATCH] reverted axel's change to menu, which introduced some other problems, and I can't reproduce that problem anymore. Axel, can you verify, please ? git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17598 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Menu.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index fe06b8118e..ade824145b 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -1544,9 +1544,7 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems, // over the whole width of its parent // TODO: this is certainly ugly, and it would be nice if there // would be a cleaner solution to this problem - if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT - || (dynamic_cast(this) != NULL - && dynamic_cast<_BMCMenuBar_*>(this) == NULL)) { + if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) { if (Parent()) *_width = Parent()->Frame().Width() + 1; else if (Window()) @@ -1559,6 +1557,9 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems, if (_height) *_height = frame.Height(); + + if (moveItems) + fUseCachedMenuLayout = true; }