Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed BOptionPopUp when used in the layout system.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33764 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2009-10-25 20:33:39 +00:00
parent 106e455e76
commit 4ac5ee1c01
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/kits/interface/OptionPopUp.cpp
View File

@ -6,7 +6,7 @@
* Stefano Ceccherini <stefano.ceccherini@gmail.com> * Stefano Ceccherini <stefano.ceccherini@gmail.com>
*/ */
#include <GroupLayout.h>
#include <MenuField.h> #include <MenuField.h>
#include <MenuItem.h> #include <MenuItem.h>
#include <OptionPopUp.h> #include <OptionPopUp.h>
@ -67,6 +67,10 @@ BOptionPopUp::BOptionPopUp(const char* name, const char* label,
BMessage* message, uint32 flags) BMessage* message, uint32 flags)
: BOptionControl(name, label, message, flags) : BOptionControl(name, label, message, flags)
{ {
// TODO: Is this really needed ? Without this, the view
// doesn't get layoutted properly
SetLayout(new BGroupLayout(B_HORIZONTAL));
BPopUpMenu *popUp = new BPopUpMenu(label, true, true); BPopUpMenu *popUp = new BPopUpMenu(label, true, true);
fMenuField = new BMenuField("_menu", label, popUp); fMenuField = new BMenuField("_menu", label, popUp);
AddChild(fMenuField); AddChild(fMenuField);
@ -274,35 +278,21 @@ BOptionPopUp::SetEnabled(bool state)
void void
BOptionPopUp::GetPreferredSize(float* _width, float* _height) BOptionPopUp::GetPreferredSize(float* _width, float* _height)
{ {
// Calculate control's height, looking at the BMenuField font's height float width, height;
fMenuField->GetPreferredSize(&width, &height);
if (_height != NULL) { if (_height != NULL) {
font_height fontHeight; font_height fontHeight;
fMenuField->GetFontHeight(&fontHeight); GetFontHeight(&fontHeight);
*_height = fontHeight.ascent + fontHeight.descent *_height = max_c(height, fontHeight.ascent + fontHeight.descent
+ fontHeight.leading + kHeightModifier; + fontHeight.leading + kHeightModifier);
} }
if (_width != NULL) { if (_width != NULL) {
float maxWidth = 0; width += fMenuField->StringWidth(BControl::Label())
BMenu *menu = fMenuField->Menu(); + kLabelSpace + kWidthModifier;
if (menu == NULL) *_width = width;
return;
// Iterate over all the entries in the control,
// and take the maximum width.
// TODO: Should we call BMenuField::GetPreferredSize() instead ?
int32 numItems = menu->CountItems();
for (int32 i = 0; i < numItems; i++) {
BMenuItem *item = menu->ItemAt(i);
if (item != NULL) {
float stringWidth = menu->StringWidth(item->Label());
maxWidth = max_c(maxWidth, stringWidth);
}
}
maxWidth += fMenuField->StringWidth(BControl::Label()) + kLabelSpace + kWidthModifier;
*_width = maxWidth;
} }
} }
@ -312,9 +302,6 @@ BOptionPopUp::GetPreferredSize(float* _width, float* _height)
void void
BOptionPopUp::ResizeToPreferred() BOptionPopUp::ResizeToPreferred()
{ {
// TODO: Some more work is needed either here or in GetPreferredSize(),
// since the control doesn't always resize as it should.
// It looks like if the font height is too big, the control gets "cut".
float width, height; float width, height;
GetPreferredSize(&width, &height); GetPreferredSize(&width, &height);
ResizeTo(width, height); ResizeTo(width, height);