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

Keymap mod keys: Conflict if either left or right

Browse Source 
... key doesn't match rather than requiring both left and right keys
to not match for a conflict.

Also update copyright year
This commit is contained in:
John Scipione
2013-08-19 15:59:55 -04:00
parent 460168d586
commit b87ee2bfeb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/ModifierKeysWindow.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2011 Haiku Inc. All rights reserved. * Copyright 2011-2013 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -754,7 +754,7 @@ ModifierKeysWindow::_DuplicateKeys()
if (left == 0 && right == 0) if (left == 0 && right == 0)
continue; continue;
if (left == testLeft && right == testRight) { if (left == testLeft || right == testRight) {
duplicateMask |= 1 << testKey; duplicateMask |= 1 << testKey;
duplicateMask |= 1 << key; duplicateMask |= 1 << key;
} }
src/preferences/keymap/ModifierKeysWindow.h
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2011 Haiku Inc. All rights reserved. * Copyright 2011-2013 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors: