You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/03/23 18:47:29 UTC
svn commit: r757468 - in /incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra:
TerraTextInputSkin.java TerraTheme_default.json
Author: tvolkert
Date: Mon Mar 23 17:47:29 2009
New Revision: 757468
URL: http://svn.apache.org/viewvc?rev=757468&view=rev
Log:
Updated invalid styles for TerraTextInputSkin
Modified:
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTheme_default.json
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=757468&r1=757467&r2=757468&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTextInputSkin.java Mon Mar 23 17:47:29 2009
@@ -236,7 +236,8 @@
private Color promptColor;
private Color backgroundColor;
private Color disabledBackgroundColor;
- private Color invalidTextBackgroundColor;
+ private Color invalidColor;
+ private Color invalidBackgroundColor;
private Color borderColor;
private Color disabledBorderColor;
private Insets padding;
@@ -249,6 +250,7 @@
// Derived colors
private Color bevelColor;
private Color disabledBevelColor;
+ private Color invalidBevelColor;
private static final int SCROLL_RATE = 50;
@@ -260,7 +262,8 @@
disabledColor = theme.getColor(7);
backgroundColor = theme.getColor(11);
disabledBackgroundColor = theme.getColor(10);
- invalidTextBackgroundColor = theme.getColor(25);
+ invalidColor = theme.getColor(4);
+ invalidBackgroundColor = theme.getColor(22);
borderColor = theme.getColor(7);
disabledBorderColor = theme.getColor(7);
padding = new Insets(2);
@@ -273,6 +276,7 @@
// Set the derived colors
bevelColor = TerraTheme.darken(backgroundColor);
disabledBevelColor = disabledBackgroundColor;
+ invalidBevelColor = TerraTheme.darken(invalidBackgroundColor);
}
@Override
@@ -342,19 +346,21 @@
Color bevelColor;
if (textInput.isEnabled()) {
- backgroundColor = this.backgroundColor;
+ if (textInput.isTextValid()) {
+ backgroundColor = this.backgroundColor;
+ bevelColor = this.bevelColor;
+ } else {
+ backgroundColor = invalidBackgroundColor;
+ bevelColor = invalidBevelColor;
+ }
+
borderColor = this.borderColor;
- bevelColor = this.bevelColor;
} else {
backgroundColor = disabledBackgroundColor;
- borderColor = this.disabledBorderColor;
+ borderColor = disabledBorderColor;
bevelColor = disabledBevelColor;
}
- if (!textInput.isTextValid()) {
- backgroundColor = invalidTextBackgroundColor;
- }
-
graphics.setStroke(new BasicStroke());
// Paint the background
@@ -403,7 +409,13 @@
Color color;
if (textInput.isEnabled()) {
- color = prompt ? promptColor : this.color;
+ if (prompt) {
+ color = promptColor;
+ } else if (!textInput.isTextValid()) {
+ color = invalidColor;
+ } else {
+ color = this.color;
+ }
} else {
color = disabledColor;
}
@@ -618,30 +630,57 @@
setBackgroundColor(theme.getColor(color));
}
- public Color getInvalidTextBackgroundColor() {
- return invalidTextBackgroundColor;
+ public Color getInvalidColor() {
+ return invalidColor;
+ }
+
+ public void setInvalidColor(Color color) {
+ if (color == null) {
+ throw new IllegalArgumentException("color is null.");
+ }
+
+ this.invalidColor = color;
+ repaintComponent();
}
- public void setInvalidTextBackgroundColor(Color color) {
- if (invalidTextBackgroundColor == null) {
- throw new IllegalArgumentException("invalidTextBackgroundColor is null.");
+ public final void setInvalidColor(String color) {
+ if (color == null) {
+ throw new IllegalArgumentException("color is null.");
+ }
+
+ setInvalidColor(decodeColor(color));
+ }
+
+ public final void setInvalidColor(int color) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setInvalidColor(theme.getColor(color));
+ }
+
+ public Color getInvalidBackgroundColor() {
+ return invalidBackgroundColor;
+ }
+
+ public void setInvalidBackgroundColor(Color color) {
+ if (color == null) {
+ throw new IllegalArgumentException("color is null.");
}
- this.invalidTextBackgroundColor = color;
+ this.invalidBackgroundColor = color;
+ invalidBevelColor = TerraTheme.darken(color);
repaintComponent();
}
- public final void setInvalidTextBackgroundColor(String color) {
+ public final void setInvalidBackgroundColor(String color) {
if (color == null) {
- throw new IllegalArgumentException("invalidTextBackgroundColor is null.");
+ throw new IllegalArgumentException("invalidBackgroundColor is null.");
}
- setInvalidTextBackgroundColor(decodeColor(color));
+ setInvalidBackgroundColor(decodeColor(color));
}
- public final void setInvalidTextBackgroundColor(int color) {
+ public final void setInvalidBackgroundColor(int color) {
TerraTheme theme = (TerraTheme)Theme.getTheme();
- setInvalidTextBackgroundColor(theme.getColor(color));
+ setInvalidBackgroundColor(theme.getColor(color));
}
public Color getDisabledBackgroundColor() {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTheme_default.json
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTheme_default.json?rev=757468&r1=757467&r2=757468&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTheme_default.json (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTheme_default.json Mon Mar 23 17:47:29 2009
@@ -9,7 +9,6 @@
"#2b5580",
"#3c77b2",
"#14538b",
- "#b0000f",
- "#ffff00"
+ "#b0000f"
]
}