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

Slightly improved layout of Keymap prefs

Browse Source 
* use the templated BLayoutBuilder
* reduced top inset to be the same as to all sides
* SetExplicitMinSize of the LayoutView so it can't shrink to
  illegibility
* set slightly smaller window default size (on small screens)
This commit is contained in:
Humdinger
2014-01-02 10:11:00 +01:00
parent 5b53e2e516
commit 803fab4fac
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/KeymapWindow.cpp
+20 -15
View File
@@ -22,6 +22,7 @@
#include <File.h> #include <File.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <GroupLayoutBuilder.h> #include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <ListView.h> #include <ListView.h>
#include <Locale.h> #include <Locale.h>
#include <MenuBar.h> #include <MenuBar.h>
@@ -82,13 +83,12 @@ compare_key_list_items(const void* a, const void* b)
KeymapWindow::KeymapWindow() KeymapWindow::KeymapWindow()
: :
BWindow(BRect(80, 50, 880, 380), B_TRANSLATE_SYSTEM_NAME("Keymap"), BWindow(BRect(80, 50, 650, 300), B_TRANSLATE_SYSTEM_NAME("Keymap"),
B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS) B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
{ {
SetLayout(new BGroupLayout(B_VERTICAL));
fKeyboardLayoutView = new KeyboardLayoutView("layout"); fKeyboardLayoutView = new KeyboardLayoutView("layout");
fKeyboardLayoutView->SetKeymap(&fCurrentMap); fKeyboardLayoutView->SetKeymap(&fCurrentMap);
fKeyboardLayoutView->SetExplicitMinSize(BSize(B_SIZE_UNSET, 192));
fTextControl = new BTextControl(B_TRANSLATE("Sample and clipboard:"), fTextControl = new BTextControl(B_TRANSLATE("Sample and clipboard:"),
"", NULL); "", NULL);
@@ -97,27 +97,32 @@ KeymapWindow::KeymapWindow()
new BMessage(kMsgSwitchShortcuts)); new BMessage(kMsgSwitchShortcuts));
// controls pane // controls pane
AddChild(BGroupLayoutBuilder(B_VERTICAL) BLayoutBuilder::Group<>(this, B_VERTICAL)
.Add(_CreateMenu()) .Add(_CreateMenu())
.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10) .AddGroup(B_HORIZONTAL)
.SetInsets(B_USE_DEFAULT_SPACING, 0, B_USE_DEFAULT_SPACING,
B_USE_DEFAULT_SPACING)
.Add(_CreateMapLists(), 0.25) .Add(_CreateMapLists(), 0.25)
.Add(BGroupLayoutBuilder(B_VERTICAL, 10) .AddGroup(B_VERTICAL)
.Add(fKeyboardLayoutView) .Add(fKeyboardLayoutView)
//.Add(new BStringView("text label", "Sample and clipboard:")) .AddGroup(B_HORIZONTAL)
.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
.Add(_CreateDeadKeyMenuField(), 0.0) .Add(_CreateDeadKeyMenuField(), 0.0)
.AddGlue() .AddGlue()
.Add(fSwitchShortcutsButton)) .Add(fSwitchShortcutsButton)
.End()
.Add(fTextControl) .Add(fTextControl)
.AddGlue(0.0) .AddGlue(0.0)
.Add(BGroupLayoutBuilder(B_HORIZONTAL, 10) .AddGroup(B_HORIZONTAL)
.Add(fDefaultsButton = new BButton("defaultsButton", .Add(fDefaultsButton = new BButton("defaultsButton",
B_TRANSLATE("Defaults"), B_TRANSLATE("Defaults"),
new BMessage(kMsgDefaultKeymap))) new BMessage(kMsgDefaultKeymap)))
.Add(fRevertButton = new BButton("revertButton", .Add(fRevertButton = new BButton("revertButton",
B_TRANSLATE("Revert"), new BMessage(kMsgRevertKeymap))) B_TRANSLATE("Revert"), new BMessage(kMsgRevertKeymap)))
.AddGlue())) .AddGlue()
.SetInsets(10, 10, 10, 10))); .End()
.End()
.End()
.End();
fKeyboardLayoutView->SetTarget(fTextControl->TextView()); fKeyboardLayoutView->SetTarget(fTextControl->TextView());
fTextControl->MakeFocus(); fTextControl->MakeFocus();
@@ -554,12 +559,12 @@ KeymapWindow::_CreateMapLists()
_SetListViewSize(fSystemListView); _SetListViewSize(fSystemListView);
_SetListViewSize(fUserListView); _SetListViewSize(fUserListView);
return BGroupLayoutBuilder(B_VERTICAL) return BLayoutBuilder::Group<>(B_VERTICAL)
.Add(new BStringView("system", B_TRANSLATE("System:"))) .Add(new BStringView("system", B_TRANSLATE("System:")))
.Add(systemScroller, 3) .Add(systemScroller, 3)
.Add(new BStringView("user", B_TRANSLATE("User:"))) .Add(new BStringView("user", B_TRANSLATE("User:")))
.Add(userScroller) .Add(userScroller)
.TopView(); .View();
} }
@@ -995,7 +1000,7 @@ KeymapWindow::_LoadSettings(BRect& windowFrame, BString& keyboardLayout)
{ {
BScreen screen(this); BScreen screen(this);
windowFrame.Set(-1, -1, 799, 329); windowFrame.Set(-1, -1, 669, 357);
// See if we can use a larger default size // See if we can use a larger default size
if (screen.Frame().Width() > 1200) { if (screen.Frame().Width() > 1200) {
windowFrame.right = 899; windowFrame.right = 899;