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/04/22 14:41:39 UTC
svn commit: r936815 - in /pivot/trunk:
tutorials/src/org/apache/pivot/tutorials/text.wtkx
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Author: gbrown
Date: Thu Apr 22 12:41:39 2010
New Revision: 936815
URL: http://svn.apache.org/viewvc?rev=936815&view=rev
Log:
Resolve PIVOT-479.
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx?rev=936815&r1=936814&r2=936815&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx Thu Apr 22 12:41:39 2010
@@ -17,7 +17,7 @@ limitations under the License.
-->
<BoxPane xmlns:wtkx="http://pivot.apache.org/wtkx"
- xmlns:validation="org.apache.pivot.wtk.text.validation"
+ xmlns:validation="org.apache.pivot.wtk.validation"
xmlns="org.apache.pivot.wtk">
<Border styles="{padding:2}">
<content>
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=936815&r1=936814&r2=936815&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 Thu Apr 22 12:41:39 2010
@@ -325,8 +325,7 @@ public class TerraTextInputSkin extends
String prompt = textInput.getPrompt();
if (glyphVector == null
- && prompt != null
- && !textInput.isFocused()) {
+ && prompt != null) {
graphics.setFont(font);
graphics.setColor(promptColor);
graphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
@@ -393,13 +392,14 @@ public class TerraTextInputSkin extends
selectedTextGraphics.dispose();
}
}
+ }
- if (selection == null
- && caretOn
- && textInput.isFocused()) {
- graphics.setColor(color);
- graphics.fill(caret);
- }
+ // Paint the caret
+ if (selection == null
+ && caretOn
+ && textInput.isFocused()) {
+ graphics.setColor(color);
+ graphics.fill(caret);
}
// Paint the border