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

Preferences: uses BLayoutBuilder instead of BGroupLayoutBuilder.

Browse Source 
* Fixes Appearance.
* Fixes Keyboard.
* Fixes Mouse.
* Fixes Notifications.
This commit is contained in:
Janus
2015-04-21 09:36:07 +00:00
parent 005198d913
commit 41425e461d
4 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/appearance/APRWindow.cpp
+5 -11
View File
@@ -13,10 +13,9 @@
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <GroupLayoutBuilder.h> #include <LayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <Messenger.h> #include <Messenger.h>
#include <SpaceLayoutItem.h>
#include <TabView.h> #include <TabView.h>
#include "AntialiasingSettingsView.h" #include "AntialiasingSettingsView.h"
@@ -40,8 +39,6 @@ APRWindow::APRWindow(BRect frame)
B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS
| B_QUIT_ON_WINDOW_CLOSE, B_ALL_WORKSPACES) | B_QUIT_ON_WINDOW_CLOSE, B_ALL_WORKSPACES)
{ {
SetLayout(new BGroupLayout(B_HORIZONTAL));
fDefaultsButton = new BButton("defaults", B_TRANSLATE("Defaults"), fDefaultsButton = new BButton("defaults", B_TRANSLATE("Defaults"),
new BMessage(kMsgSetDefaults), B_WILL_DRAW); new BMessage(kMsgSetDefaults), B_WILL_DRAW);
@@ -67,16 +64,13 @@ APRWindow::APRWindow(BRect frame)
_UpdateButtons(); _UpdateButtons();
AddChild(BGroupLayoutBuilder(B_VERTICAL) BLayoutBuilder::Group<>(this, B_VERTICAL)
.SetInsets(B_USE_DEFAULT_SPACING)
.Add(tabView) .Add(tabView)
.Add(BGroupLayoutBuilder(B_HORIZONTAL) .AddGroup(B_HORIZONTAL)
.Add(fDefaultsButton) .Add(fDefaultsButton)
.Add(fRevertButton) .Add(fRevertButton)
.AddGlue() .AddGlue();
)
.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
);
} }
src/preferences/keyboard/KeyboardWindow.cpp
+4 -10
View File
@@ -16,8 +16,7 @@
#include <Box.h> #include <Box.h>
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <GroupLayout.h> #include <LayoutBuilder.h>
#include <GroupLayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <Message.h> #include <Message.h>
#include <Screen.h> #include <Screen.h>
@@ -48,18 +47,13 @@ KeyboardWindow::KeyboardWindow()
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
// Build the layout // Build the layout
SetLayout(new BGroupLayout(B_VERTICAL)); BLayoutBuilder::Group<>(this, B_VERTICAL)
.SetInsets(B_USE_DEFAULT_SPACING)
AddChild(BGroupLayoutBuilder(B_VERTICAL)
.Add(fSettingsBox) .Add(fSettingsBox)
.AddGroup(B_HORIZONTAL) .AddGroup(B_HORIZONTAL)
.Add(fDefaultsButton) .Add(fDefaultsButton)
.Add(fRevertButton) .Add(fRevertButton)
.AddGlue() .AddGlue();
.End()
.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
);
BSlider* slider = (BSlider* )FindView("key_repeat_rate"); BSlider* slider = (BSlider* )FindView("key_repeat_rate");
if (slider !=NULL) if (slider !=NULL)
src/preferences/mouse/MouseWindow.cpp
+4 -10
View File
@@ -11,12 +11,11 @@
#include <Alert.h> #include <Alert.h>
#include <Application.h> #include <Application.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <CheckBox.h> #include <CheckBox.h>
#include <Debug.h> #include <Debug.h>
#include <LayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <Menu.h> #include <Menu.h>
#include <MenuField.h> #include <MenuField.h>
@@ -58,18 +57,13 @@ MouseWindow::MouseWindow(BRect _rect)
// buttons and draw the selected imagery // buttons and draw the selected imagery
// Build the layout // Build the layout
SetLayout(new BGroupLayout(B_VERTICAL)); BLayoutBuilder::Group<>(this, B_VERTICAL)
.SetInsets(B_USE_DEFAULT_SPACING)
AddChild(BGroupLayoutBuilder(B_VERTICAL)
.Add(fSettingsBox) .Add(fSettingsBox)
.AddGroup(B_HORIZONTAL) .AddGroup(B_HORIZONTAL)
.Add(fDefaultsButton) .Add(fDefaultsButton)
.Add(fRevertButton) .Add(fRevertButton)
.AddGlue() .AddGlue();
.End()
.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
);
// check if the window is on screen // check if the window is on screen
BRect rect = BScreen().Frame(); BRect rect = BScreen().Frame();
src/preferences/notifications/PrefletWin.cpp
+4 -11
View File
@@ -14,8 +14,7 @@
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <GroupLayout.h> #include <LayoutBuilder.h>
#include <GroupLayoutBuilder.h>
#include <Path.h> #include <Path.h>
#include <notification/Notifications.h> #include <notification/Notifications.h>
@@ -48,19 +47,13 @@ PrefletWin::PrefletWin()
fApply->SetEnabled(false); fApply->SetEnabled(false);
// Build the layout // Build the layout
SetLayout(new BGroupLayout(B_VERTICAL)); BLayoutBuilder::Group<>(this, B_VERTICAL)
.SetInsets(B_USE_DEFAULT_SPACING)
// Add childs
AddChild(BGroupLayoutBuilder(B_VERTICAL)
.Add(fMainView) .Add(fMainView)
.AddGroup(B_HORIZONTAL) .AddGroup(B_HORIZONTAL)
.Add(fRevert) .Add(fRevert)
.AddGlue() .AddGlue()
.Add(fApply) .Add(fApply);
.End()
.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
);
ReloadSettings(); ReloadSettings();