You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/08/24 17:54:10 UTC

svn commit: r988606 - /pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java

Author: gbrown
Date: Tue Aug 24 15:54:10 2010
New Revision: 988606

URL: http://svn.apache.org/viewvc?rev=988606&view=rev
Log:
Fix minor caret painting bug.

Modified:
    pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.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=988606&r1=988605&r2=988606&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 Aug 24 15:54:10 2010
@@ -315,6 +315,7 @@ public class TerraTextInputSkin extends 
 
         String prompt = textInput.getPrompt();
 
+        Color caretColor;
         if (glyphVector == null
             && prompt != null) {
             graphics.setFont(font);
@@ -325,6 +326,8 @@ public class TerraTextInputSkin extends 
                 fontRenderContext.getFractionalMetricsHint());
             graphics.drawString(prompt, padding.left - scrollLeft + 1,
                 (height - textHeight) / 2 + ascent);
+
+            caretColor = color;
         } else {
             boolean textValid = textInput.isTextValid();
 
@@ -339,6 +342,8 @@ public class TerraTextInputSkin extends 
                color = disabledColor;
             }
 
+            caretColor = color;
+
             if (glyphVector != null) {
                 graphics.setFont(font);
 
@@ -389,7 +394,7 @@ public class TerraTextInputSkin extends 
         if (selection == null
             && caretOn
             && textInput.isFocused()) {
-            graphics.setColor(color);
+            graphics.setColor(caretColor);
             graphics.fill(caret);
         }