svn commit: r1824560 - /pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java

[rwhitcomb]

Author: rwhitcomb
Date: Fri Feb 16 22:12:21 2018
New Revision: 1824560

URL: http://svn.apache.org/viewvc?rev=1824560&view=rev
Log:
PIVOT-1014: Add the "setXXXColor(int)" methods in TerraAccordionSkin.

Modified:
    
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java

Modified: 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: 
http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=1824560&r1=1824559&r2=1824560&view=diff
==============================================================================
--- 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
 (original)
+++ 
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
 Fri Feb 16 22:12:21 2018
@@ -325,20 +325,18 @@ public class TerraAccordionSkin extends
     private static final int DEFAULT_SELECTION_CHANGE_RATE = 30;
 
     public TerraAccordionSkin() {
+        setBackgroundColor(4);
+        setBorderColor(7);
+        setButtonColor(12);
+        setDisabledButtonColor(7);
+        setButtonBackgroundColor(10);
+
         Theme theme = currentTheme();
-        setBackgroundColor(theme.getColor(4));
+        buttonFont = theme.getFont().deriveFont(Font.BOLD);
 
-        borderColor = theme.getColor(7);
         padding = new Insets(4);
-        buttonFont = theme.getFont().deriveFont(Font.BOLD);
-        buttonColor = theme.getColor(12);
-        disabledButtonColor = theme.getColor(7);
-        buttonBackgroundColor = theme.getColor(10);
         buttonPadding = new Insets(6, 8);   // height, width
 
-        // Set the derived colors
-        buttonBevelColor = TerraTheme.brighten(buttonBackgroundColor);
-
         panelHeaderGroup.getButtonGroupListeners().add(new 
ButtonGroupListener() {
             @Override
             public void selectionChanged(ButtonGroup buttonGroup, Button 
previousSelection) {
@@ -387,7 +385,7 @@ public class TerraAccordionSkin extends
         }
 
         int preferredWidth = Math.max(maxPanelHeaderWidth, maxPanelWidth
-            + (padding.left + padding.right + 2));
+            + (padding.getWidth() + 2));
 
         return preferredWidth;
     }
@@ -558,21 +556,6 @@ public class TerraAccordionSkin extends
         }
     }
 
-    public Color getBorderColor() {
-        return borderColor;
-    }
-
-    public void setBorderColor(Color borderColor) {
-        Utils.checkNull(borderColor, "borderColor");
-
-        this.borderColor = borderColor;
-        repaintComponent();
-    }
-
-    public final void setBorderColor(String borderColor) {
-        setBorderColor(GraphicsUtilities.decodeColor(borderColor, 
"borderColor"));
-    }
-
     public Insets getPadding() {
         return padding;
     }
@@ -623,6 +606,26 @@ public class TerraAccordionSkin extends
         setButtonFont(Theme.deriveFont(buttonFont));
     }
 
+    public Color getBorderColor() {
+        return borderColor;
+    }
+
+    public void setBorderColor(Color borderColor) {
+        Utils.checkNull(borderColor, "borderColor");
+
+        this.borderColor = borderColor;
+        repaintComponent();
+    }
+
+    public final void setBorderColor(String borderColor) {
+        setBorderColor(GraphicsUtilities.decodeColor(borderColor, 
"borderColor"));
+    }
+
+    public final void setBorderColor(int borderColor) {
+        Theme theme = currentTheme();
+        setBorderColor(theme.getColor(borderColor));
+    }
+
     public Color getButtonColor() {
         return buttonColor;
     }
@@ -699,6 +702,10 @@ public class TerraAccordionSkin extends
         setButtonPadding(new Insets(buttonPadding));
     }
 
+    public final void setButtonPadding(Sequence<?> buttonPadding) {
+        setButtonPadding(new Insets(buttonPadding));
+    }
+
     public final void setButtonPadding(int buttonPadding) {
         setButtonPadding(new Insets(buttonPadding));
     }