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

reverted axel's change to menu, which introduced some other problems, and I can't reproduce that problem anymore. Axel, can you verify, please ?

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17598 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-05-26 17:28:18 +00:00
parent 178d3441ad
commit 73f99cd6ae
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+4 -3
View File
@@ -1544,9 +1544,7 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
// over the whole width of its parent // over the whole width of its parent
// TODO: this is certainly ugly, and it would be nice if there // TODO: this is certainly ugly, and it would be nice if there
// would be a cleaner solution to this problem // would be a cleaner solution to this problem
if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) {
|| (dynamic_cast<BMenuBar*>(this) != NULL
&& dynamic_cast<_BMCMenuBar_*>(this) == NULL)) {
if (Parent()) if (Parent())
*_width = Parent()->Frame().Width() + 1; *_width = Parent()->Frame().Width() + 1;
else if (Window()) else if (Window())
@@ -1559,6 +1557,9 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
if (_height) if (_height)
*_height = frame.Height(); *_height = frame.Height();
if (moveItems)
fUseCachedMenuLayout = true;
} }