[haiku-commits] r43222 - haiku/trunk/src/preferences/keymap
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 8 Nov 2011 08:03:54 +0100 (CET)
Author: jscipione
Date: 2011-11-08 08:03:54 +0100 (Tue, 08 Nov 2011)
New Revision: 43222
Changeset: https://dev.haiku-os.org/changeset/43222
Modified:
haiku/trunk/src/preferences/keymap/ModifierKeysWindow.cpp
Log:
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.
Modified: haiku/trunk/src/preferences/keymap/ModifierKeysWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/ModifierKeysWindow.cpp 2011-11-08
06:47:31 UTC (rev 43221)
+++ haiku/trunk/src/preferences/keymap/ModifierKeysWindow.cpp 2011-11-08
07:03:54 UTC (rev 43222)
@@ -292,7 +292,8 @@
BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)),
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);
fControlMenu->AddItem(item, key);
@@ -315,7 +316,8 @@
BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)),
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);
fOptionMenu->AddItem(item, key);
@@ -338,7 +340,8 @@
BMenuItem* item = new BMenuItem(B_TRANSLATE(_KeyToString(key)),
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);
fCommandMenu->AddItem(item, key);
Other related posts:
- » [haiku-commits] r43222 - haiku/trunk/src/preferences/keymap - jscipione