From ed1b7b12d4c4e31df87c14926b6cb58f1e628632 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 8 Nov 2011 07:03:54 +0000 Subject: [PATCH] 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. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43222 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/keymap/ModifierKeysWindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/preferences/keymap/ModifierKeysWindow.cpp b/src/preferences/keymap/ModifierKeysWindow.cpp index 72a93205c7..f880a82f94 100644 --- a/src/preferences/keymap/ModifierKeysWindow.cpp +++ b/src/preferences/keymap/ModifierKeysWindow.cpp @@ -292,7 +292,8 @@ ModifierKeysWindow::_CreateControlMenuField() 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 @@ ModifierKeysWindow::_CreateOptionMenuField() 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 @@ ModifierKeysWindow::_CreateCommandMenuField() 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);