You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2011/11/22 18:01:34 UTC

svn commit: r1205079 - in /pivot/trunk: wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java

Author: rwhitcomb
Date: Tue Nov 22 17:01:33 2011
New Revision: 1205079

URL: http://svn.apache.org/viewvc?rev=1205079&view=rev
Log:
Add support in the three text field components (TextInput, TextArea and
TextPane) for doing a "paste" operation with the Shift-INSERT key.  This
is a standard keyboard shortcut on Windows and seems like a bug to many
users on Windows.  Linux also supports this convention, and it doesn't
seem to hurt on OSX because many Mac keyboards do not have the INSERT
key so it will never be invoked.  It does work, however, using Shift-0
on the numeric keypad (in non-numeric mode).

Modified:
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
    pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java

Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=1205079&r1=1205078&r2=1205079&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Tue Nov 22 17:01:33 2011
@@ -1298,6 +1298,11 @@ public class TerraTextInputSkin extends 
 
                 consumed = true;
             }
+        } else if (keyCode == Keyboard.KeyCode.INSERT) {
+            if (Keyboard.isPressed(Keyboard.Modifier.SHIFT) && textInput.isEditable()) {
+                textInput.paste();
+                consumed = true;
+            }
         } else {
             consumed = super.keyPressed(component, keyCode, keyLocation);
         }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=1205079&r1=1205078&r2=1205079&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Tue Nov 22 17:01:33 2011
@@ -1266,6 +1266,12 @@ public class TextAreaSkin extends Compon
 
                     consumed = true;
                 }
+            } else if (keyCode == Keyboard.KeyCode.INSERT) {
+                if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
+                    && textArea.isEditable()) {
+                    textArea.paste();
+                    consumed = true;
+                }
             } else {
                 consumed = super.keyPressed(component, keyCode, keyLocation);
             }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java?rev=1205079&r1=1205078&r2=1205079&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkin.java Tue Nov 22 17:01:33 2011
@@ -1037,6 +1037,12 @@ public class TextPaneSkin extends Contai
                 scrollCharacterToVisible(textPane.getCharacterCount() - 1);
 
                 consumed = true;
+            } else if (keyCode == Keyboard.KeyCode.INSERT) {
+                if (Keyboard.isPressed(Keyboard.Modifier.SHIFT)
+                    && textPane.isEditable()) {
+                    textPane.paste();
+                    consumed = true;
+                }
             } else {
                 consumed = super.keyPressed(component, keyCode, keyLocation);
             }