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/08/20 15:00:58 UTC
svn commit: r987488 -
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/
Author: gbrown
Date: Fri Aug 20 13:00:58 2010
New Revision: 987488
URL: http://svn.apache.org/viewvc?rev=987488&view=rev
Log:
Additional Terra color tweaks to help facilitate custom color schemes.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json
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=987488&r1=987487&r2=987488&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 Aug 20 13:00:58 2010
@@ -319,7 +319,7 @@ public class TerraAccordionSkin extends
borderColor = theme.getColor(7);
padding = new Insets(4);
buttonFont = theme.getFont().deriveFont(Font.BOLD);
- buttonColor = theme.getColor(13);
+ buttonColor = theme.getColor(12);
disabledButtonColor = theme.getColor(7);
buttonBackgroundColor = theme.getColor(10);
buttonPadding = new Insets(3, 4, 3, 4);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Fri Aug 20 13:00:58 2010
@@ -387,7 +387,7 @@ public class TerraCalendarSkin extends C
color = theme.getColor(1);
disabledColor = theme.getColor(7);
selectionColor = theme.getColor(4);
- selectionBackgroundColor = theme.getColor(13);
+ selectionBackgroundColor = theme.getColor(14);
highlightColor = theme.getColor(1);
highlightBackgroundColor = theme.getColor(10);
dividerColor = theme.getColor(9);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCheckboxSkin.java Fri Aug 20 13:00:58 2010
@@ -64,7 +64,7 @@ public class TerraCheckboxSkin extends C
buttonColor = theme.getColor(4);
buttonBorderColor = theme.getColor(7);
- buttonSelectionColor = theme.getColor(12);
+ buttonSelectionColor = theme.getColor(15);
disabledButtonColor = theme.getColor(3);
disabledButtonBorderColor = theme.getColor(7);
disabledButtonSelectionColor = theme.getColor(7);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Fri Aug 20 13:00:58 2010
@@ -252,7 +252,7 @@ public class TerraExpanderSkin extends E
titleRow.add(titleBoxPane);
titleRow.add(buttonBoxPane);
- titleLabel.getStyles().put("color", theme.getColor(13));
+ titleLabel.getStyles().put("color", theme.getColor(12));
Font titleFont = theme.getFont().deriveFont(Font.BOLD);
titleLabel.getStyles().put("font", titleFont);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Fri Aug 20 13:00:58 2010
@@ -243,8 +243,8 @@ public class TerraFrameSkin extends Wind
setBackgroundColor(theme.getColor(10));
titleBarColor = theme.getColor(4);
- titleBarBackgroundColor = theme.getColor(17);
- titleBarBorderColor = theme.getColor(15);
+ titleBarBackgroundColor = theme.getColor(14);
+ titleBarBorderColor = theme.getColor(12);
inactiveTitleBarColor = theme.getColor(7);
inactiveTitleBarBackgroundColor = theme.getColor(9);
inactiveTitleBarBorderColor = theme.getColor(7);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Fri Aug 20 13:00:58 2010
@@ -85,7 +85,7 @@ public class TerraListViewSkin extends C
disabledColor = theme.getColor(7);
backgroundColor = theme.getColor(4);
selectionColor = theme.getColor(4);
- selectionBackgroundColor = theme.getColor(13);
+ selectionBackgroundColor = theme.getColor(14);
inactiveSelectionColor = theme.getColor(1);
inactiveSelectionBackgroundColor = theme.getColor(9);
highlightBackgroundColor = theme.getColor(10);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Fri Aug 20 13:00:58 2010
@@ -61,7 +61,7 @@ public class TerraMenuSkin extends Conta
color = theme.getColor(1);
disabledColor = theme.getColor(7);
activeColor = theme.getColor(4);
- activeBackgroundColor = theme.getColor(13);
+ activeBackgroundColor = theme.getColor(14);
marginColor = theme.getColor(11);
marginColor = new Color(marginColor.getRed(), marginColor.getGreen(),
marginColor.getBlue(), 228);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Fri Aug 20 13:00:58 2010
@@ -161,8 +161,8 @@ public class TerraPaletteSkin extends Wi
setBackgroundColor(theme.getColor(10));
titleBarColor = theme.getColor(4);
- titleBarBackgroundColor = theme.getColor(16);
- titleBarBorderColor = theme.getColor(13);
+ titleBarBackgroundColor = theme.getColor(14);
+ titleBarBorderColor = theme.getColor(12);
contentBorderColor = theme.getColor(7);
// Set the derived colors
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRadioButtonSkin.java Fri Aug 20 13:00:58 2010
@@ -64,7 +64,7 @@ public class TerraRadioButtonSkin extend
buttonColor = theme.getColor(4);
buttonBorderColor = theme.getColor(7);
- buttonSelectionColor = theme.getColor(13);
+ buttonSelectionColor = theme.getColor(15);
disabledButtonColor = theme.getColor(3);
disabledButtonBorderColor = theme.getColor(7);
disabledButtonSelectionColor = theme.getColor(7);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Fri Aug 20 13:00:58 2010
@@ -93,7 +93,7 @@ public class TerraTableViewSkin extends
disabledColor = theme.getColor(7);
backgroundColor = theme.getColor(4);
selectionColor = theme.getColor(4);
- selectionBackgroundColor = theme.getColor(13);
+ selectionBackgroundColor = theme.getColor(14);
inactiveSelectionColor = theme.getColor(1);
inactiveSelectionBackgroundColor = theme.getColor(9);
highlightBackgroundColor = theme.getColor(10);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextAreaSkin.java Fri Aug 20 13:00:58 2010
@@ -27,7 +27,7 @@ public class TerraTextAreaSkin extends T
setColor(1);
setInactiveColor(7);
setSelectionColor(4);
- setSelectionBackgroundColor(13);
+ setSelectionBackgroundColor(14);
setInactiveSelectionColor(1);
setInactiveSelectionBackgroundColor(9);
}
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=987488&r1=987487&r2=987488&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 Fri Aug 20 13:00:58 2010
@@ -169,7 +169,7 @@ public class TerraTextInputSkin extends
padding = new Insets(2);
selectionColor = theme.getColor(4);
- selectionBackgroundColor = theme.getColor(13);
+ selectionBackgroundColor = theme.getColor(14);
inactiveSelectionColor = theme.getColor(1);
inactiveSelectionBackgroundColor = theme.getColor(9);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Fri Aug 20 13:00:58 2010
@@ -464,7 +464,7 @@ public class TerraTreeViewSkin extends C
disabledColor = theme.getColor(7);
backgroundColor = theme.getColor(4);
selectionColor = theme.getColor(4);
- selectionBackgroundColor = theme.getColor(13);
+ selectionBackgroundColor = theme.getColor(14);
inactiveSelectionColor = theme.getColor(1);
inactiveSelectionBackgroundColor = theme.getColor(10);
highlightColor = theme.getColor(1);
@@ -476,7 +476,7 @@ public class TerraTreeViewSkin extends C
showEmptyBranchControls = true;
branchControlColor = theme.getColor(12);
branchControlSelectionColor = theme.getColor(4);
- branchControlInactiveSelectionColor = theme.getColor(13);
+ branchControlInactiveSelectionColor = theme.getColor(14);
gridColor = theme.getColor(11);
showGridLines = false;
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json?rev=987488&r1=987487&r2=987488&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_theme_styles.json Fri Aug 20 13:00:58 2010
@@ -17,8 +17,8 @@
{ commandButton: {
font: {bold:true},
color: 4,
- backgroundColor: 17,
- borderColor: 15,
+ backgroundColor: 14,
+ borderColor: 12,
disabledBackgroundColor: 10,
disabledBorderColor: 7,
padding: {top:3, left:4, bottom:3, right:4},