From 9b2ea762dbb43e633cf8ec162fab123db8db034e Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Mon, 23 May 2011 18:27:29 +0000 Subject: [PATCH] * Fix layout problem which appeared with the introduction of CollapsingLayouter. Basically, one of the layouts expected empty columns to act like glue, which is how they worked at the time. Now use BSpaceLayoutItem::CreateGlue() to get equivalent behaviour. * Also do a very small bit of refactoring, to have MediaFileInfoView take better charge of its max size. +alpha git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41686 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/mediaconverter/MediaConverterWindow.cpp | 2 +- src/apps/mediaconverter/MediaFileInfoView.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp index 423a11b268..58d644bbb5 100644 --- a/src/apps/mediaconverter/MediaConverterWindow.cpp +++ b/src/apps/mediaconverter/MediaConverterWindow.cpp @@ -142,7 +142,6 @@ MediaConverterWindow::MediaConverterWindow(BRect frame) fInfoBox = new BBox(B_FANCY_BORDER, fInfoView); fInfoBox->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_USE_FULL_HEIGHT)); - fInfoBox->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); float padding = be_control_look->DefaultItemSpacing(); @@ -232,6 +231,7 @@ MediaConverterWindow::MediaConverterWindow(BRect frame) .SetInsets(padding, 0, padding, padding) .Add(fStatus, 0, 0) .Add(fFileStatus, 0, 1) + .Add(BSpaceLayoutItem::CreateGlue(), 1, 0) .Add(fPreviewButton, 2, 0) .Add(fConvertButton, 3, 0) .End() diff --git a/src/apps/mediaconverter/MediaFileInfoView.cpp b/src/apps/mediaconverter/MediaFileInfoView.cpp index dd870c6a7c..7eae04aac0 100644 --- a/src/apps/mediaconverter/MediaFileInfoView.cpp +++ b/src/apps/mediaconverter/MediaFileInfoView.cpp @@ -90,7 +90,7 @@ MediaFileInfoView::MinSize() BSize MediaFileInfoView::MaxSize() { - return fMinSize; + return BSize(B_SIZE_UNLIMITED, fMinSize.height); }