Author: gbrown
Date: Fri May 21 17:46:07 2010
New Revision: 947088
URL: http://svn.apache.org/viewvc?rev=947088&view=rev
Log:
Resolve issue PIVOT-501.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java?rev=947088&r1=947087&r2=947088&view=diff
==============================================================================
---
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
(original)
+++
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
Fri May 21 17:46:07 2010
@@ -614,7 +614,21 @@ public class TerraScrollBarSkin extends
scrollBar.add(scrollDownButton);
scrollBar.add(handle);
- setBackgroundColor(9);
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+
+ Color backgroundColor = theme.getColor(9);
+ Color brightBackgroundColor = TerraTheme.brighten(backgroundColor);
+
+ GradientPaint backgroundPaint;
+ if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
+ backgroundPaint = new GradientPaint(0, 1, backgroundColor,
+ 0, DEFAULT_THICKNESS - 2, brightBackgroundColor);
+ } else {
+ backgroundPaint = new GradientPaint(1, 0, backgroundColor,
+ DEFAULT_THICKNESS - 2, 0, brightBackgroundColor);
+ }
+
+ setBackgroundPaint(backgroundPaint);
enabledChanged(scrollBar);
}
@@ -789,24 +803,6 @@ public class TerraScrollBarSkin extends
}
}
- @Override
- public void setBackgroundColor(Color backgroundColor) {
- ScrollBar scrollBar = (ScrollBar)getComponent();
-
- Color brightBackgroundColor = TerraTheme.brighten(backgroundColor);
- GradientPaint gradientPaint;
-
- if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
- gradientPaint = new GradientPaint(0, 1, backgroundColor,
- 0, DEFAULT_THICKNESS - 2, brightBackgroundColor);
- } else {
- gradientPaint = new GradientPaint(1, 0, backgroundColor,
- DEFAULT_THICKNESS - 2, 0, brightBackgroundColor);
- }
-
- setBackgroundPaint(gradientPaint);
- }
-
public final void setBackgroundColor(int backgroundColor) {
TerraTheme theme = (TerraTheme)Theme.getTheme();
setBackgroundColor(theme.getColor(backgroundColor));
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java?rev=947088&r1=947087&r2=947088&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java Fri May 21
17:46:07 2010
@@ -197,11 +197,7 @@ public abstract class ContainerSkin exte
}
public Color getBackgroundColor() {
- if (backgroundPaint != null
- && !(backgroundPaint instanceof Color)) {
- throw new IllegalStateException("Background paint is not a
Color.");
- }
- return (Color)backgroundPaint;
+ return (backgroundPaint instanceof Color) ? (Color)backgroundPaint :
null;
}
public void setBackgroundColor(Color backgroundColor) {
