From e80276e2d797269d46da99eecad6b2cc97d15141 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Mon, 6 Sep 2010 08:41:48 +0000 Subject: [PATCH] Fix some more regressions from r38512, Tracker prefs, Icon-O-Matic, Expander & Screenshot. Thanks to diver for finding these. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38538 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/expander/ExpanderWindow.cpp | 2 +- src/apps/icon-o-matic/MainWindow.cpp | 7 +++-- src/apps/screenshot/ScreenshotWindow.cpp | 8 +++--- src/kits/tracker/SettingsViews.cpp | 34 +++++++++++++----------- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index 438cba6c44..540169b794 100644 --- a/src/apps/expander/ExpanderWindow.cpp +++ b/src/apps/expander/ExpanderWindow.cpp @@ -62,7 +62,7 @@ ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref* ref, fSettings(*settings), fPreferences(NULL) { - BGroupLayout* layout = new BGroupLayout(B_VERTICAL); + BGroupLayout* layout = new BGroupLayout(B_VERTICAL, 0); SetLayout(layout); _AddMenuBar(layout); diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp index cd0790f72d..db3fd73e41 100644 --- a/src/apps/icon-o-matic/MainWindow.cpp +++ b/src/apps/icon-o-matic/MainWindow.cpp @@ -601,11 +601,12 @@ MainWindow::_CreateGUI(BRect bounds) SetLayout(new BGroupLayout(B_HORIZONTAL)); BGridLayout* layout = new BGridLayout(); + layout->SetSpacing(0, 0); BView* rootView = new BView("root view", 0, layout); AddChild(rootView); rootView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - BGroupView* leftTopView = new BGroupView(B_VERTICAL); + BGroupView* leftTopView = new BGroupView(B_VERTICAL, 0); layout->AddView(leftTopView, 0, 0); leftTopView->SetExplicitMinSize(BSize(splitWidth, B_SIZE_UNSET)); @@ -658,7 +659,7 @@ MainWindow::_CreateGUI(BRect bounds) leftTopView->AddChild(iconPreviews); - BGroupView* leftSideView = new BGroupView(B_VERTICAL); + BGroupView* leftSideView = new BGroupView(B_VERTICAL, 0); layout->AddView(leftSideView, 0, 1); leftSideView->SetExplicitMinSize(BSize(splitWidth, B_SIZE_UNSET)); @@ -719,6 +720,7 @@ MainWindow::_CreateGUI(BRect bounds) leftSideView->AddChild(propScrollView); BGroupLayout* topSide = new BGroupLayout(B_HORIZONTAL); + topSide->SetSpacing(0); BView* topSideView = new BView("top side view", 0, topSide); layout->AddView(topSideView, 1, 0); @@ -763,6 +765,7 @@ MainWindow::_CreateGUI(BRect bounds) // swatch group BGroupLayout* swatchGroup = new BGroupLayout(B_VERTICAL); + swatchGroup->SetSpacing(0); BView* swatchGroupView = new BView("swatch group", 0, swatchGroup); topSide->AddView(swatchGroupView); diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp index f4538df83a..22ece00ab9 100644 --- a/src/apps/screenshot/ScreenshotWindow.cpp +++ b/src/apps/screenshot/ScreenshotWindow.cpp @@ -199,12 +199,12 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility, bool silent, gridLayout->SetMinColumnWidth(1, menuField->StringWidth("SomethingLongHere")); - SetLayout(new BGroupLayout(B_HORIZONTAL)); + SetLayout(new BGroupLayout(B_HORIZONTAL, 0)); - AddChild(BGroupLayoutBuilder(B_VERTICAL) + AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10.0) .Add(fPreview) - .AddGroup(B_VERTICAL) + .AddGroup(B_VERTICAL, 0) .Add(fActiveWindow) .Add(fWindowBorder) .Add(fShowCursor) @@ -214,7 +214,7 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility, bool silent, .Add(seconds) .End() .AddStrut(10.0) - .Add(gridLayout->View()) + .Add(gridLayout) .AddGlue() .End()) .AddStrut(10) diff --git a/src/kits/tracker/SettingsViews.cpp b/src/kits/tracker/SettingsViews.cpp index bcc875c02b..939e9c841f 100644 --- a/src/kits/tracker/SettingsViews.cpp +++ b/src/kits/tracker/SettingsViews.cpp @@ -191,10 +191,10 @@ DesktopSettingsView::DesktopSettingsView() const float spacing = be_control_look->DefaultItemSpacing(); BGroupLayoutBuilder(this) - .AddGroup(B_VERTICAL) + .AddGroup(B_VERTICAL, 0) .Add(fShowDisksIconRadioButton) .Add(fMountVolumesOntoDesktopRadioButton) - .AddGroup(B_VERTICAL) + .AddGroup(B_VERTICAL, 0) .Add(fMountSharedVolumesOntoDesktopCheckBox) .SetInsets(20, 0, 0, 0) .End() @@ -434,8 +434,8 @@ WindowsSettingsView::WindowsSettingsView() const float spacing = be_control_look->DefaultItemSpacing(); BGroupLayoutBuilder(this) - .AddGroup(B_VERTICAL) - .AddGroup(B_VERTICAL) + .AddGroup(B_VERTICAL, 0) + .AddGroup(B_VERTICAL, 0) .Add(fShowFullPathInTitleBarCheckBox) .Add(fSingleWindowBrowseCheckBox) .End() @@ -443,7 +443,7 @@ WindowsSettingsView::WindowsSettingsView() .Add(fShowNavigatorCheckBox) .SetInsets(20, 0, 0, 0) .End() - .AddGroup(B_VERTICAL) + .AddGroup(B_VERTICAL, 0) .Add(fOutlineSelectionCheckBox) .Add(fSortFolderNamesFirstCheckBox) .Add(fTypeAheadFilteringCheckBox) @@ -730,12 +730,13 @@ SpaceBarSettingsView::SpaceBarSettingsView() const float spacing = be_control_look->DefaultItemSpacing(); - BGroupLayoutBuilder(this) - .AddGroup(B_VERTICAL) - .Add(fSpaceBarShowCheckBox) - .Add(box) + BGroupLayout* layout = GroupLayout(); + layout->SetOrientation(B_VERTICAL); + layout->SetSpacing(0); + BGroupLayoutBuilder(layout) + .Add(fSpaceBarShowCheckBox) + .Add(box) .AddGlue() - .End() .SetInsets(spacing, spacing, spacing, spacing); } @@ -947,12 +948,13 @@ TrashSettingsView::TrashSettingsView() const float spacing = be_control_look->DefaultItemSpacing(); - BGroupLayoutBuilder(this) - .AddGroup(B_VERTICAL) - .Add(fDontMoveFilesToTrashCheckBox) - .Add(fAskBeforeDeleteFileCheckBox) - .AddGlue() - .End() + BGroupLayout* layout = GroupLayout(); + layout->SetOrientation(B_VERTICAL); + layout->SetSpacing(0); + BGroupLayoutBuilder(layout) + .Add(fDontMoveFilesToTrashCheckBox) + .Add(fAskBeforeDeleteFileCheckBox) + .AddGlue() .SetInsets(spacing, spacing, spacing, spacing); }