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

* Don't set an explicit max size, instead calculate a proper max size in

Browse Source 
MaxSize(). This makes sure that MaxSize() returns a proper size when the
  user "unsets" the explicite max size.
* minimum label height is 0 if there is no label.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27583 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-09-16 10:45:27 +00:00
parent 10d8f3749e
commit 08edea662b
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/MenuField.h
+1 -1
View File
@@ -93,7 +93,7 @@ class BMenuField : public BView {
protected: protected:
virtual void DoLayout(); virtual void DoLayout();
private: private:
class LabelLayoutItem; class LabelLayoutItem;
class MenuBarLayoutItem; class MenuBarLayoutItem;
struct LayoutData; struct LayoutData;
src/kits/interface/MenuField.cpp
+13 -7
View File
@@ -673,7 +673,11 @@ BMenuField::MaxSize()
CALLED(); CALLED();
_ValidateLayoutData(); _ValidateLayoutData();
return BLayoutUtils::ComposeSize(ExplicitMaxSize(), fLayoutData->min);
BSize max = fLayoutData->min;
max.width = B_SIZE_UNLIMITED;
return BLayoutUtils::ComposeSize(ExplicitMaxSize(), max);
} }
@@ -811,9 +815,6 @@ BMenuField::InitObject(const char *label)
fDivider = (float)floor(Frame().Width() / 2.0f); fDivider = (float)floor(Frame().Width() / 2.0f);
else else
fDivider = 0; fDivider = 0;
// default to unlimited maximum width
SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
} }
@@ -998,8 +999,13 @@ BMenuField::_ValidateLayoutData()
font_height& fh = fLayoutData->font_info; font_height& fh = fLayoutData->font_info;
GetFontHeight(&fh); GetFontHeight(&fh);
fLayoutData->label_width = (Label() ? ceilf(StringWidth(Label())) : 0); if (Label() != NULL) {
fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent); fLayoutData->label_width = ceilf(StringWidth(Label()));
fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent);
} else {
fLayoutData->label_width = 0;
fLayoutData->label_height = 0;
}
// compute the minimal divider // compute the minimal divider
float divider = 0; float divider = 0;
@@ -1138,7 +1144,7 @@ BMenuField::MenuBarLayoutItem::MenuBarLayoutItem(BMenuField* parent)
: fParent(parent), : fParent(parent),
fFrame() fFrame()
{ {
// by default the part left of the divider shall have an unlimited maximum // by default the part right of the divider shall have an unlimited maximum
// width // width
SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
} }