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

Fix layout problems in Filetypes that became apparent with the introduction of CollapsingLayouter.

Browse Source 
+alpha


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41662 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson 2011-05-22 19:50:38 +00:00
parent c0b58c071f
commit e50d758205
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/preferences/filetypes/AttributeWindow.cpp
View File

@ -243,18 +243,17 @@ AttributeWindow::AttributeWindow(FileTypesWindow* target, BMimeType& mimeType,
BLayoutBuilder::Grid<>(padding, padding / 2)
.Add(fDisplayAsMenuField->CreateLabelLayoutItem(), 0, 0)
.Add(fDisplayAsMenuField->CreateMenuBarLayoutItem(), 1, 0)
.Add(fEditableCheckBox, 3, 0)
.Add(fEditableCheckBox, 2, 0)
.Add(fSpecialControl->CreateLabelLayoutItem(), 0, 1)
.Add(fSpecialControl->CreateTextViewLayoutItem(), 1, 1, 3)
.Add(fSpecialControl->CreateTextViewLayoutItem(), 1, 1, 2)
.Add(fWidthControl->CreateLabelLayoutItem(), 0, 2)
.Add(fWidthControl->CreateTextViewLayoutItem(), 1, 2, 3)
.Add(fWidthControl->CreateTextViewLayoutItem(), 1, 2, 2)
.Add(fAlignmentMenuField->CreateLabelLayoutItem(), 0, 3)
.Add(fAlignmentMenuField->CreateMenuBarLayoutItem(), 1, 3, 3)
.Add(fAlignmentMenuField->CreateMenuBarLayoutItem(), 1, 3, 2)
.SetInsets(padding, padding, padding, padding)
.View())
)
.AddGroup(B_HORIZONTAL, padding)
.Add(BSpaceLayoutItem::CreateGlue())
.Add(BSpaceLayoutItem::CreateGlue())
.Add(cancelButton)
.Add(fAcceptButton);

21
src/preferences/filetypes/FileTypesWindow.cpp
View File

@ -116,6 +116,8 @@ class ExtensionListView : public DropTargetListView {
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
virtual ~ExtensionListView();
virtual BSize MinSize();
virtual void MessageReceived(BMessage* message);
virtual bool AcceptsDrag(const BMessage* message);
@ -123,6 +125,7 @@ class ExtensionListView : public DropTargetListView {
private:
BMimeType fType;
BSize fMinSize;
};
@ -247,6 +250,23 @@ ExtensionListView::~ExtensionListView()
}
BSize
ExtensionListView::MinSize()
{
if (!fMinSize.IsWidthSet() || fMinSize.IsHeightSet()) {
BFont font;
GetFont(&font);
fMinSize.width = font.StringWidth(".mmmmm");
font_height height;
font.GetHeight(&height);
fMinSize.height = (height.ascent + height.descent + height.leading) * 3;
}
return fMinSize;
}
void
ExtensionListView::MessageReceived(BMessage* message)
{
@ -432,7 +452,6 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
.Add(fRuleControl, 0, 4, 3, 1)
.SetInsets(padding, padding, padding, padding);
recognitionBoxGrid->SetExplicitAlignment(fullAlignment);
fRecognitionBox->AddChild(recognitionBoxGrid);
// "Description" group