Merge from layout management branch.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18649 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -7,9 +7,11 @@
|
||||
* Stefano Ceccherini ([email protected])
|
||||
*/
|
||||
|
||||
#include <MenuBar.h>
|
||||
|
||||
#include <Application.h>
|
||||
#include <Autolock.h>
|
||||
#include <MenuBar.h>
|
||||
#include <LayoutUtils.h>
|
||||
#include <MenuItem.h>
|
||||
#include <Window.h>
|
||||
|
||||
@@ -297,6 +299,21 @@ BMenuBar::Perform(perform_code d, void *arg)
|
||||
}
|
||||
|
||||
|
||||
BSize
|
||||
BMenuBar::MaxSize()
|
||||
{
|
||||
// TODO: cache the result
|
||||
float width, height;
|
||||
GetPreferredSize(&width, &height);
|
||||
|
||||
return BLayoutUtils::ComposeSize(ExplicitMaxSize(),
|
||||
BSize(B_SIZE_UNLIMITED, height));
|
||||
}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
|
||||
|
||||
void BMenuBar::_ReservedMenuBar1() {}
|
||||
void BMenuBar::_ReservedMenuBar2() {}
|
||||
void BMenuBar::_ReservedMenuBar3() {}
|
||||
|
||||
Reference in New Issue
Block a user