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

Another small change to the Keymap Modifier Keys window. Only mark the control, option, and command menu items if both the left and right keys are set.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43222 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
John Scipione
2011-11-08 07:03:54 +00:00
parent bce949f531
commit ed1b7b12d4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/ModifierKeysWindow.cpp
+6 -3
View File
@@ -292,7 +292,8 @@ ModifierKeysWindow::_CreateControlMenuField()
BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)), BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)),
message); message);
if (fCurrentMap->left_control_key == _KeyToKeyCode(key)) if (fCurrentMap->left_control_key == _KeyToKeyCode(key)
&& fCurrentMap->right_control_key == _KeyToKeyCode(key, true))
item->SetMarked(true); item->SetMarked(true);
fControlMenu->AddItem(item, key); fControlMenu->AddItem(item, key);
@@ -315,7 +316,8 @@ ModifierKeysWindow::_CreateOptionMenuField()
BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)), BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)),
message); message);
if (fCurrentMap->left_option_key == _KeyToKeyCode(key)) if (fCurrentMap->left_option_key == _KeyToKeyCode(key)
&& fCurrentMap->right_option_key == _KeyToKeyCode(key, true))
item->SetMarked(true); item->SetMarked(true);
fOptionMenu->AddItem(item, key); fOptionMenu->AddItem(item, key);
@@ -338,7 +340,8 @@ ModifierKeysWindow::_CreateCommandMenuField()
BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)), BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)),
message); message);
if (fCurrentMap->left_command_key == _KeyToKeyCode(key)) if (fCurrentMap->left_command_key == _KeyToKeyCode(key)
&& fCurrentMap->right_command_key == _KeyToKeyCode(key, true))
item->SetMarked(true); item->SetMarked(true);
fCommandMenu->AddItem(item, key); fCommandMenu->AddItem(item, key);