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

Patch by "yourpalal": The previous hack to embed the menufield is no

Browse Source 
longer necessary. Resolves #3637 - thanks!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35740 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-03-03 17:47:29 +00:00
parent 2bcccf5a74
commit 8a076abfc1
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/filetypes/FileTypesWindow.cpp
+13 -15
View File
@@ -495,9 +495,11 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
innerRect = fPreferredBox->Bounds().InsetByCopy(8.0f, 6.0f); innerRect = fPreferredBox->Bounds().InsetByCopy(8.0f, 6.0f);
innerRect.top += ceilf(boldHeight.ascent); innerRect.top += ceilf(boldHeight.ascent);
innerRect.left = innerRect.right - button->StringWidth("Same as" B_UTF8_ELLIPSIS) - 24.0f; innerRect.left = innerRect.right - button->StringWidth(
"Same as" B_UTF8_ELLIPSIS) - 24.0f;
innerRect.bottom = innerRect.top + button->Bounds().Height(); innerRect.bottom = innerRect.top + button->Bounds().Height();
fSameAsButton = new BButton(innerRect, "same as", "Same as" B_UTF8_ELLIPSIS, fSameAsButton = new BButton(innerRect, "same as",
"Same as" B_UTF8_ELLIPSIS,
new BMessage(kMsgSamePreferredAppAs), B_FOLLOW_RIGHT); new BMessage(kMsgSamePreferredAppAs), B_FOLLOW_RIGHT);
fPreferredBox->AddChild(fSameAsButton); fPreferredBox->AddChild(fSameAsButton);
@@ -507,32 +509,28 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
fPreferredBox->AddChild(fSelectButton); fPreferredBox->AddChild(fSelectButton);
menu = new BPopUpMenu("preferred"); menu = new BPopUpMenu("preferred");
menu->AddItem(item = new BMenuItem("None", new BMessage(kMsgPreferredAppChosen))); menu->AddItem(item = new BMenuItem("None",
new BMessage(kMsgPreferredAppChosen)));
item->SetMarked(true); item->SetMarked(true);
innerRect.right = innerRect.left - 6.0f; innerRect.right = innerRect.left - 6.0f;
innerRect.left = 8.0f; innerRect.left = 8.0f;
BView* constrainingView = new BView(innerRect, NULL, B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW);
constrainingView->SetViewColor(topView->ViewColor());
fPreferredField = new BMenuField(innerRect.OffsetToCopy(B_ORIGIN), "preferred", fPreferredField = new BMenuField(innerRect, "preferred", NULL, menu, true,
NULL, menu); B_FOLLOW_LEFT_RIGHT);
float width; float width;
fPreferredField->GetPreferredSize(&width, &height); fPreferredField->GetPreferredSize(&width, &height);
fPreferredField->ResizeTo(innerRect.Width(), height); fPreferredField->ResizeTo(innerRect.Width(), height);
fPreferredField->MoveBy(0.0f, (innerRect.Height() - height) / 2.0f); fPreferredField->MoveBy(0.0f, (innerRect.Height() - height) / 2.0f);
constrainingView->AddChild(fPreferredField);
// we embed the menu field in another view to make it behave like
// we want so that it can't obscure other elements with larger
// labels
fPreferredBox->AddChild(constrainingView); fPreferredBox->AddChild(fPreferredField);
// "Extra Attributes" group // "Extra Attributes" group
rect.top = rect.bottom + 8.0f; rect.top = rect.bottom + 8.0f;
rect.bottom = topView->Bounds().Height() - 8.0f; rect.bottom = topView->Bounds().Height() - 8.0f;
fAttributeBox = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP_BOTTOM); fAttributeBox = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT
| B_FOLLOW_TOP_BOTTOM);
fAttributeBox->SetLabel("Extra attributes"); fAttributeBox->SetLabel("Extra attributes");
topView->AddChild(fAttributeBox); topView->AddChild(fAttributeBox);
@@ -540,8 +538,8 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
innerRect.top += ceilf(boldHeight.ascent); innerRect.top += ceilf(boldHeight.ascent);
innerRect.left = innerRect.right - button->StringWidth("Remove") - 16.0f; innerRect.left = innerRect.right - button->StringWidth("Remove") - 16.0f;
innerRect.bottom = innerRect.top + button->Bounds().Height(); innerRect.bottom = innerRect.top + button->Bounds().Height();
fAddAttributeButton = new BButton(innerRect, "add attr", "Add" B_UTF8_ELLIPSIS, fAddAttributeButton = new BButton(innerRect, "add attr",
new BMessage(kMsgAddAttribute), B_FOLLOW_RIGHT); "Add" B_UTF8_ELLIPSIS, new BMessage(kMsgAddAttribute), B_FOLLOW_RIGHT);
fAttributeBox->AddChild(fAddAttributeButton); fAttributeBox->AddChild(fAddAttributeButton);
innerRect.OffsetBy(0, innerRect.Height() + 4.0f); innerRect.OffsetBy(0, innerRect.Height() + 4.0f);