You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2011/03/25 00:53:39 UTC
svn commit: r1085206 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
Keyboard.java Platform.java
Author: smartini
Date: Thu Mar 24 23:53:39 2011
New Revision: 1085206
URL: http://svn.apache.org/viewvc?rev=1085206&view=rev
Log:
PIVOT-719
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java?rev=1085206&r1=1085205&r2=1085206&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java Thu Mar 24 23:53:39 2011
@@ -113,8 +113,13 @@ public final class Keyboard {
awtModifiers |= KeyEvent.SHIFT_DOWN_MASK;
}
- return KeyEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
- + KeyEvent.getKeyText(keyCode);
+ if (awtModifiers != 0x00) {
+ return KeyEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
+ + KeyEvent.getKeyText(keyCode);
+ }
+ else {
+ return KeyEvent.getKeyText(keyCode);
+ }
}
public static KeyStroke decode(String value) {
@@ -306,4 +311,3 @@ public final class Keyboard {
return dropAction;
}
}
-
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java?rev=1085206&r1=1085205&r2=1085206&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java Thu Mar 24 23:53:39 2011
@@ -45,6 +45,10 @@ public class Platform {
COMMAND_MODIFIER = Modifier.META;
WORD_NAVIGATION_MODIFIER = Modifier.ALT;
KEYSTROKE_MODIFIER_SEPARATOR = "";
+ } else if (osName.startsWith("windows")) {
+ COMMAND_MODIFIER = Modifier.CTRL;
+ WORD_NAVIGATION_MODIFIER = Modifier.CTRL;
+ KEYSTROKE_MODIFIER_SEPARATOR = "+";
} else {
COMMAND_MODIFIER = Modifier.CTRL;
WORD_NAVIGATION_MODIFIER = Modifier.CTRL;