Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keymap mod keys: style fixes

This commit is contained in:
John Scipione 2013-08-19 15:00:14 -04:00
parent 2388b04ab8
commit c197198238
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/preferences/keymap/ModifierKeysWindow.cpp
View File

@ -47,6 +47,7 @@
const rgb_color disabledColor = (rgb_color){128, 128, 128, 255}; const rgb_color disabledColor = (rgb_color){128, 128, 128, 255};
const rgb_color normalColor = (rgb_color){0, 0, 0, 255}; const rgb_color normalColor = (rgb_color){0, 0, 0, 255};
enum { enum {
SHIFT_KEY = 0x00000001, SHIFT_KEY = 0x00000001,
CONTROL_KEY = 0x00000002, CONTROL_KEY = 0x00000002,
@ -63,6 +64,7 @@ enum {
MENU_ITEM_DISABLED MENU_ITEM_DISABLED
}; };
static const uint32 kMsgUpdateModifier = 'upmd'; static const uint32 kMsgUpdateModifier = 'upmd';
static const uint32 kMsgApplyModifiers = 'apmd'; static const uint32 kMsgApplyModifiers = 'apmd';
static const uint32 kMsgRevertModifiers = 'rvmd'; static const uint32 kMsgRevertModifiers = 'rvmd';
@ -459,6 +461,7 @@ ModifierKeysWindow::_CreateShiftMenuField()
fShiftMenu->AddItem(item, key); fShiftMenu->AddItem(item, key);
} }
fShiftMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, fShiftMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET)); B_ALIGN_VERTICAL_UNSET));
@ -487,6 +490,7 @@ ModifierKeysWindow::_CreateControlMenuField()
fControlMenu->AddItem(item, key); fControlMenu->AddItem(item, key);
} }
fControlMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, fControlMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET)); B_ALIGN_VERTICAL_UNSET));
@ -515,6 +519,7 @@ ModifierKeysWindow::_CreateOptionMenuField()
fOptionMenu->AddItem(item, key); fOptionMenu->AddItem(item, key);
} }
fOptionMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, fOptionMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET)); B_ALIGN_VERTICAL_UNSET));
@ -542,6 +547,7 @@ ModifierKeysWindow::_CreateCommandMenuField()
B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message); B_TRANSLATE_NOCOLLECT(_KeyToString(key)), message);
fCommandMenu->AddItem(item, key); fCommandMenu->AddItem(item, key);
} }
fCommandMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, fCommandMenu->SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_VERTICAL_UNSET)); B_ALIGN_VERTICAL_UNSET));
@ -713,7 +719,7 @@ ModifierKeysWindow::_ValidateDuplicateKeys()
// return a mask marking which keys are duplicates of each other for // return a mask marking which keys are duplicates of each other for
// validation. Control = 1, Option = 2, Command = 3 // validation. Shift = 0, Control = 1, Option = 2, Command = 3
uint32 uint32
ModifierKeysWindow::_DuplicateKeys() ModifierKeysWindow::_DuplicateKeys()
{ {