From 471b5ec49612ad795d34e574a26155272f3c339d Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Wed, 2 Mar 2011 00:22:24 +0000 Subject: [PATCH] DiskUsage : * Reduce the height of the StatusView. It was way taller than necessary. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40772 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/diskusage/StatusView.cpp | 15 +++++++++------ src/apps/diskusage/VolumeView.cpp | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/apps/diskusage/StatusView.cpp b/src/apps/diskusage/StatusView.cpp index 9276695d79..9bc932a53e 100644 --- a/src/apps/diskusage/StatusView.cpp +++ b/src/apps/diskusage/StatusView.cpp @@ -48,12 +48,15 @@ StatusView::StatusView() 999999); fCountView = new BStringView(NULL, kEmptyStr); + float width, height; + fCountView->GetPreferredSize(&width, &height); fCountView->SetExplicitMinSize(BSize(StringWidth(testLabel), B_SIZE_UNSET)); - fCountView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); + fCountView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, height)); fPathView = new BStringView(NULL, kEmptyStr); - fPathView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); + fPathView->GetPreferredSize(&width, &height); + fPathView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, height)); fRefreshBtn = new BButton(NULL, B_TRANSLATE("Scan"), new BMessage(kBtnRescan)); @@ -71,11 +74,11 @@ StatusView::StatusView() SetLayout(new BGroupLayout(B_VERTICAL)); - AddChild(BLayoutBuilder::Group<>(B_HORIZONTAL) - .AddGroup(B_VERTICAL) + AddChild(BLayoutBuilder::Group<>(B_HORIZONTAL, 0) + .AddGroup(B_VERTICAL, 0) .Add(fPathView) .Add(divider1) - .AddGroup(B_HORIZONTAL) + .AddGroup(B_HORIZONTAL, 0) .Add(fCountView) .Add(divider2) .Add(fSizeView) @@ -83,7 +86,7 @@ StatusView::StatusView() .End() .AddStrut(kSmallHMargin) .Add(fRefreshBtn) - .SetInsets(kSmallHMargin, kSmallVMargin, kSmallVMargin, kSmallVMargin) + .SetInsets(kSmallVMargin, kSmallVMargin, kSmallVMargin, kSmallVMargin) ); } diff --git a/src/apps/diskusage/VolumeView.cpp b/src/apps/diskusage/VolumeView.cpp index 2bd3838a91..2b0f80a3f7 100644 --- a/src/apps/diskusage/VolumeView.cpp +++ b/src/apps/diskusage/VolumeView.cpp @@ -39,7 +39,7 @@ VolumeView::VolumeView(const char* name, BVolume* volume) fStatusView = new StatusView(); - AddChild(BLayoutBuilder::Group<>(B_VERTICAL) + AddChild(BLayoutBuilder::Group<>(B_VERTICAL, 2) .Add(fPieView) .Add(fStatusView) );