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/09/30 23:35:17 UTC
svn commit: r1003297 - in
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra:
TerraCalendarButtonSkin.java TerraColorChooserButtonSkin.java
TerraListButtonSkin.java TerraMenuButtonSkin.java
Author: gbrown
Date: Thu Sep 30 21:35:17 2010
New Revision: 1003297
URL: http://svn.apache.org/viewvc?rev=1003297&view=rev
Log:
Additional minor updates to popup button skins.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
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/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=1003297&r1=1003296&r2=1003297&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Thu Sep 30 21:35:17 2010
@@ -246,7 +246,7 @@ public class TerraCalendarButtonSkin ext
if (calendarButton.isEnabled()) {
backgroundColor = this.backgroundColor;
- bevelColor = (pressed || (calendarPopup.isOpen() && closeTransition == null)) ?
+ bevelColor = (pressed || (calendarPopup.isOpen() && !calendarPopup.isClosing())) ?
pressedBevelColor : this.bevelColor;
borderColor = this.borderColor;
} else {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java?rev=1003297&r1=1003296&r2=1003297&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraColorChooserButtonSkin.java Thu Sep 30 21:35:17 2010
@@ -244,7 +244,7 @@ public class TerraColorChooserButtonSkin
if (colorChooserButton.isEnabled()) {
backgroundColor = this.backgroundColor;
- bevelColor = (pressed || (colorChooserPopup.isOpen() && closeTransition == null)) ?
+ bevelColor = (pressed || (colorChooserPopup.isOpen() && !colorChooserPopup.isClosing())) ?
pressedBevelColor : this.bevelColor;
borderColor = this.borderColor;
} else {
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=1003297&r1=1003296&r2=1003297&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 Thu Sep 30 21:35:17 2010
@@ -307,7 +307,7 @@ public class TerraListButtonSkin extends
if (listButton.isEnabled()) {
color = this.color;
backgroundColor = this.backgroundColor;
- bevelColor = (pressed || (listViewPopup.isOpen() && closeTransition == null)) ?
+ bevelColor = (pressed || (listViewPopup.isOpen() && !listViewPopup.isClosing())) ?
pressedBevelColor : this.bevelColor;
borderColor = this.borderColor;
} else {
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=1003297&r1=1003296&r2=1003297&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 Thu Sep 30 21:35:17 2010
@@ -234,7 +234,8 @@ public class TerraMenuButtonSkin extends
if (menuButton.isEnabled()) {
color = this.color;
backgroundColor = this.backgroundColor;
- bevelColor = (pressed || menuPopup.isOpen()) ? pressedBevelColor : this.bevelColor;
+ bevelColor = (pressed || (menuPopup.isOpen() && !menuPopup.isClosing())) ?
+ pressedBevelColor : this.bevelColor;
borderColor = this.borderColor;
} else {
color = disabledColor;