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

Rather use B_SIZE_UNSET for fPreferredSize.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21425 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-06-17 01:11:08 +00:00
parent cb968676d9
commit 05e3a10655
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/CheckBox.cpp
+5 -5
View File
@@ -18,7 +18,7 @@
BCheckBox::BCheckBox(BRect frame, const char *name, const char *label, BCheckBox::BCheckBox(BRect frame, const char *name, const char *label,
BMessage *message, uint32 resizingMode, uint32 flags) BMessage *message, uint32 resizingMode, uint32 flags)
: BControl(frame, name, label, message, resizingMode, flags), : BControl(frame, name, label, message, resizingMode, flags),
fPreferredSize(-1, -1), fPreferredSize(),
fOutlined(false) fOutlined(false)
{ {
// Resize to minimum height if needed // Resize to minimum height if needed
@@ -34,7 +34,7 @@ BCheckBox::BCheckBox(BRect frame, const char *name, const char *label,
BCheckBox::BCheckBox(const char *name, const char *label, BMessage *message, BCheckBox::BCheckBox(const char *name, const char *label, BMessage *message,
uint32 flags) uint32 flags)
: BControl(name, label, message, flags | B_WILL_DRAW | B_NAVIGABLE), : BControl(name, label, message, flags | B_WILL_DRAW | B_NAVIGABLE),
fPreferredSize(-1, -1), fPreferredSize(),
fOutlined(false) fOutlined(false)
{ {
} }
@@ -42,7 +42,7 @@ BCheckBox::BCheckBox(const char *name, const char *label, BMessage *message,
BCheckBox::BCheckBox(const char *label, BMessage *message) BCheckBox::BCheckBox(const char *label, BMessage *message)
: BControl(NULL, label, message, B_WILL_DRAW | B_NAVIGABLE), : BControl(NULL, label, message, B_WILL_DRAW | B_NAVIGABLE),
fPreferredSize(-1, -1), fPreferredSize(),
fOutlined(false) fOutlined(false)
{ {
} }
@@ -458,7 +458,7 @@ void
BCheckBox::InvalidateLayout(bool descendants) BCheckBox::InvalidateLayout(bool descendants)
{ {
// invalidate cached preferred size // invalidate cached preferred size
fPreferredSize.Set(-1, -1); fPreferredSize.Set(B_SIZE_UNSET, B_SIZE_UNSET);
BControl::InvalidateLayout(descendants); BControl::InvalidateLayout(descendants);
} }
@@ -514,7 +514,7 @@ BCheckBox::_CheckBoxFrame() const
BSize BSize
BCheckBox::_ValidatePreferredSize() BCheckBox::_ValidatePreferredSize()
{ {
if (fPreferredSize.width < 0) { if (!fPreferredSize.IsWidthSet()) {
font_height fontHeight; font_height fontHeight;
GetFontHeight(&fontHeight); GetFontHeight(&fontHeight);