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
This commit is contained in:
parent
178d3441ad
commit
73f99cd6ae
@ -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<BMenuBar*>(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;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user