Also override MinSize() and PreferredSize().

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21464 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-06-19 23:02:34 +00:00
parent 45f929b494
commit 23b9a91178
2 changed files with 18 additions and 5 deletions
+2
View File
@@ -81,7 +81,9 @@ public:
// layout related // layout related
virtual BSize MinSize();
virtual BSize MaxSize(); virtual BSize MaxSize();
virtual BSize PreferredSize();
/*----- Private or reserved -----------------------------------------*/ /*----- Private or reserved -----------------------------------------*/
virtual status_t Perform(perform_code d, void *arg); virtual status_t Perform(perform_code d, void *arg);
+16 -5
View File
@@ -327,15 +327,26 @@ BMenuBar::Perform(perform_code d, void *arg)
} }
BSize
BMenuBar::MinSize()
{
return BMenu::MinSize();
}
BSize BSize
BMenuBar::MaxSize() BMenuBar::MaxSize()
{ {
// TODO: cache the result BSize size = BMenu::MaxSize();
float width, height;
GetPreferredSize(&width, &height);
return BLayoutUtils::ComposeSize(ExplicitMaxSize(), return BLayoutUtils::ComposeSize(ExplicitMaxSize(),
BSize(B_SIZE_UNLIMITED, height)); BSize(B_SIZE_UNLIMITED, size.height));
}
BSize
BMenuBar::PreferredSize()
{
return BMenu::PreferredSize();
} }