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/03/10 22:57:58 UTC
svn commit: r921587 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraListButtonSkin.java TerraMenuButtonSkin.java
Author: gbrown
Date: Wed Mar 10 21:57:57 2010
New Revision: 921587
URL: http://svn.apache.org/viewvc?rev=921587&view=rev
Log:
Add palette color setters to TerraMenuButtonSkin; fix minor paint issue in TerraListButtonSkin and TerraMenuButtonSkin.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=921587&r1=921586&r2=921587&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Wed Mar 10 21:57:57 2010
@@ -245,16 +245,19 @@ public class TerraListButtonSkin extends
int width = getWidth();
int height = getHeight();
+ Color color = null;
Color backgroundColor = null;
Color bevelColor = null;
Color borderColor = null;
if (listButton.isEnabled()) {
+ color = this.color;
backgroundColor = this.backgroundColor;
bevelColor = (pressed
|| (listViewPopup.isOpen() && closeTransition == null)) ? pressedBevelColor : this.bevelColor;
borderColor = this.borderColor;
} else {
+ color = disabledColor;
backgroundColor = disabledBackgroundColor;
bevelColor = disabledBevelColor;
borderColor = disabledBorderColor;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=921587&r1=921586&r2=921587&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Wed Mar 10 21:57:57 2010
@@ -100,8 +100,6 @@ public class TerraMenuButtonSkin extends
public int getPreferredWidth(int height) {
int preferredWidth = 0;
-
-
if (height == -1) {
preferredWidth = getPreferredSize().width;
} else {
@@ -205,6 +203,7 @@ public class TerraMenuButtonSkin extends
int width = getWidth();
int height = getHeight();
+ Color color = null;
Color backgroundColor = null;
Color bevelColor = null;
Color borderColor = null;
@@ -214,10 +213,12 @@ public class TerraMenuButtonSkin extends
|| menuButton.isFocused()
|| menuPopup.isOpen()) {
if (menuButton.isEnabled()) {
+ color = this.color;
backgroundColor = this.backgroundColor;
bevelColor = (pressed || menuPopup.isOpen()) ? pressedBevelColor : this.bevelColor;
borderColor = this.borderColor;
} else {
+ color = disabledColor;
backgroundColor = disabledBackgroundColor;
bevelColor = disabledBevelColor;
borderColor = disabledBorderColor;
@@ -348,6 +349,11 @@ public class TerraMenuButtonSkin extends
setColor(GraphicsUtilities.decodeColor(color));
}
+ public final void setColor(int color) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setColor(theme.getColor(color));
+ }
+
public Color getDisabledColor() {
return disabledColor;
}
@@ -369,6 +375,11 @@ public class TerraMenuButtonSkin extends
setDisabledColor(GraphicsUtilities.decodeColor(disabledColor));
}
+ public final void setDisabledColor(int disabledColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setDisabledColor(theme.getColor(disabledColor));
+ }
+
public Color getBackgroundColor() {
return backgroundColor;
}
@@ -392,6 +403,11 @@ public class TerraMenuButtonSkin extends
setBackgroundColor(GraphicsUtilities.decodeColor(backgroundColor));
}
+ public final void setBackgroundColor(int backgroundColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setBackgroundColor(theme.getColor(backgroundColor));
+ }
+
public Color getDisabledBackgroundColor() {
return disabledBackgroundColor;
}
@@ -414,6 +430,11 @@ public class TerraMenuButtonSkin extends
setDisabledBackgroundColor(GraphicsUtilities.decodeColor(disabledBackgroundColor));
}
+ public final void setDisabledBackgroundColor(int disabledBackgroundColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setDisabledBackgroundColor(theme.getColor(disabledBackgroundColor));
+ }
+
public Color getBorderColor() {
return borderColor;
}
@@ -436,6 +457,11 @@ public class TerraMenuButtonSkin extends
setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
+ public final void setBorderColor(int borderColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setBorderColor(theme.getColor(borderColor));
+ }
+
public Color getDisabledBorderColor() {
return disabledBorderColor;
}
@@ -457,6 +483,11 @@ public class TerraMenuButtonSkin extends
setDisabledBorderColor(GraphicsUtilities.decodeColor(disabledBorderColor));
}
+ public final void setDisabledBorderColor(int disabledBorderColor) {
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ setDisabledBorderColor(theme.getColor(disabledBorderColor));
+ }
+
public Insets getPadding() {
return padding;
}