i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some more regressions from r38512, Tracker prefs, Icon-O-Matic, Expander & Screenshot. Thanks to diver for finding these.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38538 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson
2010-09-06 08:41:48 +00:00
parent 3243de5750
commit e80276e2d7
4 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/expander/ExpanderWindow.cpp
+1 -1
View File
@@ -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);
src/apps/icon-o-matic/MainWindow.cpp
+5 -2
View File
@@ -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);
src/apps/screenshot/ScreenshotWindow.cpp
+4 -4
View File
@@ -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)
src/kits/tracker/SettingsViews.cpp
+18 -16
View File
@@ -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);
}