⛏️ index : haiku.git

8a226db3518bb3e72ec4ad4ec611f9908211da64 [patch]

452b7cf89ea075e11a876ae1f56b636894ed33ce

d6eff13b61bd85aca33887d702c73592bf56f624

8a226db3518bb3e72ec4ad4ec611f9908211da64.tar.gz

Merge 41662: layout fixes in filetypes.

git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@41663 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 src/preferences/filetypes/AttributeWindow.cpp |  9 +++++----
 src/preferences/filetypes/FileTypesWindow.cpp | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/preferences/filetypes/AttributeWindow.cpp b/src/preferences/filetypes/AttributeWindow.cpp
index 83e6ba6..645ca3f 100644
--- a/src/preferences/filetypes/AttributeWindow.cpp
+++ b/src/preferences/filetypes/AttributeWindow.cpp
@@ -243,18 +243,17 @@
			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);
diff --git a/src/preferences/filetypes/FileTypesWindow.cpp b/src/preferences/filetypes/FileTypesWindow.cpp
index 6812baa..b8f0364 100644
--- a/src/preferences/filetypes/FileTypesWindow.cpp
+++ b/src/preferences/filetypes/FileTypesWindow.cpp
@@ -116,6 +116,8 @@
			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 @@

	private:
		BMimeType	fType;
		BSize		fMinSize;
};


@@ -243,7 +246,24 @@


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;
}


@@ -432,7 +452,6 @@
		.Add(fRuleControl, 0, 4, 3, 1)
		.SetInsets(padding, padding, padding, padding);

	recognitionBoxGrid->SetExplicitAlignment(fullAlignment);
	fRecognitionBox->AddChild(recognitionBoxGrid);

	// "Description" group