[haiku-commits] r38538 - in haiku/trunk/src: apps/expander apps/icon-o-matic apps/screenshot kits/tracker
- From: yourpalal2@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 6 Sep 2010 10:41:48 +0200 (CEST)
Author: yourpalal
Date: 2010-09-06 10:41:48 +0200 (Mon, 06 Sep 2010)
New Revision: 38538
Changeset: http://dev.haiku-os.org/changeset/38538
Modified:
haiku/trunk/src/apps/expander/ExpanderWindow.cpp
haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp
haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
haiku/trunk/src/kits/tracker/SettingsViews.cpp
Log:
Fix some more regressions from r38512, Tracker prefs, Icon-O-Matic, Expander &
Screenshot. Thanks to diver for finding these.
Modified: haiku/trunk/src/apps/expander/ExpanderWindow.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderWindow.cpp 2010-09-05 22:56:22 UTC
(rev 38537)
+++ haiku/trunk/src/apps/expander/ExpanderWindow.cpp 2010-09-06 08:41:48 UTC
(rev 38538)
@@ -62,7 +62,7 @@
fSettings(*settings),
fPreferences(NULL)
{
- BGroupLayout* layout = new BGroupLayout(B_VERTICAL);
+ BGroupLayout* layout = new BGroupLayout(B_VERTICAL, 0);
SetLayout(layout);
_AddMenuBar(layout);
Modified: haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp 2010-09-05 22:56:22 UTC
(rev 38537)
+++ haiku/trunk/src/apps/icon-o-matic/MainWindow.cpp 2010-09-06 08:41:48 UTC
(rev 38538)
@@ -601,11 +601,12 @@
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 @@
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 @@
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 @@
// swatch group
BGroupLayout* swatchGroup = new BGroupLayout(B_VERTICAL);
+ swatchGroup->SetSpacing(0);
BView* swatchGroupView = new BView("swatch group", 0, swatchGroup);
topSide->AddView(swatchGroupView);
Modified: haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp
===================================================================
--- haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp 2010-09-05
22:56:22 UTC (rev 38537)
+++ haiku/trunk/src/apps/screenshot/ScreenshotWindow.cpp 2010-09-06
08:41:48 UTC (rev 38538)
@@ -199,12 +199,12 @@
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 @@
.Add(seconds)
.End()
.AddStrut(10.0)
- .Add(gridLayout->View())
+ .Add(gridLayout)
.AddGlue()
.End())
.AddStrut(10)
Modified: haiku/trunk/src/kits/tracker/SettingsViews.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/SettingsViews.cpp 2010-09-05 22:56:22 UTC
(rev 38537)
+++ haiku/trunk/src/kits/tracker/SettingsViews.cpp 2010-09-06 08:41:48 UTC
(rev 38538)
@@ -191,10 +191,10 @@
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 @@
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 @@
.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 @@
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 @@
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);
}
Other related posts:
- » [haiku-commits] r38538 - in haiku/trunk/src: apps/expander apps/icon-o-matic apps/screenshot kits/tracker - yourpalal2
