You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by cb...@apache.org on 2010/09/29 15:25:03 UTC
svn commit: r1002616 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/skin/
Author: cbartlett
Date: Wed Sep 29 13:25:03 2010
New Revision: 1002616
URL: http://svn.apache.org/viewvc?rev=1002616&view=rev
Log:
PIVOT-534 - Reorder source to meet Pivot conventions. Addition of constants for default values of transition rate & duration styles.
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/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/TerraExpanderSkin.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
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTooltipSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.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=1002616&r1=1002615&r2=1002616&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 Wed Sep 29 13:25:03 2010
@@ -293,6 +293,9 @@ public class TerraAccordionSkin extends
private Color buttonBackgroundColor;
private Insets buttonPadding;
+ private int selectionChangeDuration = DEFAULT_SELECTION_CHANGE_DURATION;
+ private int selectionChangeRate = DEFAULT_SELECTION_CHANGE_RATE;
+
private Color buttonBevelColor;
private SelectionChangeTransition selectionChangeTransition = null;
@@ -310,8 +313,8 @@ public class TerraAccordionSkin extends
public static final int GRADIENT_BEVEL_THICKNESS = 4;
- private int selectionChangeDuration = 250;
- private int selectionChangeRate = 30;
+ private static final int DEFAULT_SELECTION_CHANGE_DURATION = 250;
+ private static final int DEFAULT_SELECTION_CHANGE_RATE = 30;
public TerraAccordionSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
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=1002616&r1=1002615&r2=1002616&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 Wed Sep 29 13:25:03 2010
@@ -145,6 +145,9 @@ public class TerraCalendarButtonSkin ext
private Color disabledBorderColor;
private Insets padding;
+ private int closeTransitionDuration = DEFAULT_CLOSE_TRANSITION_DURATION;
+ private int closeTransitionRate = DEFAULT_CLOSE_TRANSITION_RATE;
+
private Color bevelColor;
private Color pressedBevelColor;
private Color disabledBevelColor;
@@ -155,8 +158,8 @@ public class TerraCalendarButtonSkin ext
private static final int CORNER_RADIUS = 4;
private static final int TRIGGER_WIDTH = 10;
- private int closeTransitionDuration = 250;
- private int closeTransitionRate = 30;
+ private static final int DEFAULT_CLOSE_TRANSITION_DURATION = 250;
+ private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraCalendarButtonSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
@@ -378,22 +381,6 @@ public class TerraCalendarButtonSkin ext
setFont(Theme.deriveFont(font));
}
- public int getCloseTransitionDuration() {
- return closeTransitionDuration;
- }
-
- public void setCloseTransitionDuration(int closeTransitionDuration) {
- this.closeTransitionDuration = closeTransitionDuration;
- }
-
- public int getCloseTransitionRate() {
- return closeTransitionRate;
- }
-
- public void setCloseTransitionRate(int closeTransitionRate) {
- this.closeTransitionRate = closeTransitionRate;
- }
-
public Color getColor() {
return color;
}
@@ -595,6 +582,22 @@ public class TerraCalendarButtonSkin ext
setPadding(Insets.decode(padding));
}
+ public int getCloseTransitionDuration() {
+ return closeTransitionDuration;
+ }
+
+ public void setCloseTransitionDuration(int closeTransitionDuration) {
+ this.closeTransitionDuration = closeTransitionDuration;
+ }
+
+ public int getCloseTransitionRate() {
+ return closeTransitionRate;
+ }
+
+ public void setCloseTransitionRate(int closeTransitionRate) {
+ this.closeTransitionRate = closeTransitionRate;
+ }
+
// Calendar button events
@Override
public void localeChanged(CalendarButton calendarButton, Locale previousLocale) {
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=1002616&r1=1002615&r2=1002616&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 Wed Sep 29 13:25:03 2010
@@ -140,6 +140,9 @@ public class TerraColorChooserButtonSkin
private Color disabledBorderColor;
private Insets padding;
+ private int closeTransitionDuration = DEFAULT_CLOSE_TRANSITION_DURATION;
+ private int closeTransitionRate = DEFAULT_CLOSE_TRANSITION_RATE;
+
private Color bevelColor;
private Color pressedBevelColor;
private Color disabledBevelColor;
@@ -150,8 +153,8 @@ public class TerraColorChooserButtonSkin
private static final int CORNER_RADIUS = 4;
private static final int TRIGGER_WIDTH = 10;
- private int closeTransitionDuration = 250;
- private int closeTransitionRate = 30;
+ private static final int DEFAULT_CLOSE_TRANSITION_DURATION = 250;
+ private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraColorChooserButtonSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
@@ -383,22 +386,6 @@ public class TerraColorChooserButtonSkin
setFont(Theme.deriveFont(font));
}
- public int getCloseTransitionDuration() {
- return closeTransitionDuration;
- }
-
- public void setCloseTransitionDuration(int closeTransitionDuration) {
- this.closeTransitionDuration = closeTransitionDuration;
- }
-
- public int getCloseTransitionRate() {
- return closeTransitionRate;
- }
-
- public void setCloseTransitionRate(int closeTransitionRate) {
- this.closeTransitionRate = closeTransitionRate;
- }
-
public Color getColor() {
return color;
}
@@ -569,4 +556,20 @@ public class TerraColorChooserButtonSkin
setPadding(Insets.decode(padding));
}
+
+ public int getCloseTransitionDuration() {
+ return closeTransitionDuration;
+ }
+
+ public void setCloseTransitionDuration(int closeTransitionDuration) {
+ this.closeTransitionDuration = closeTransitionDuration;
+ }
+
+ public int getCloseTransitionRate() {
+ return closeTransitionRate;
+ }
+
+ public void setCloseTransitionRate(int closeTransitionRate) {
+ this.closeTransitionRate = closeTransitionRate;
+ }
}
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=1002616&r1=1002615&r2=1002616&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 Wed Sep 29 13:25:03 2010
@@ -25,13 +25,13 @@ import java.awt.RenderingHints;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Vote;
+import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Expander;
-import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.Insets;
@@ -192,10 +192,11 @@ public class TerraExpanderSkin extends E
private Color borderColor;
private Insets padding;
+ private int expandDuration = DEFAULT_EXPAND_DURATION;
+ private int expandRate = DEFAULT_EXPAND_RATE;
+
private Color titleBarBevelColor;
- private int expandDuration = 250;
- private int expandRate = 30;
private ExpandTransition expandTransition = null;
private ClipDecorator clipDecorator = new ClipDecorator();
@@ -217,6 +218,9 @@ public class TerraExpanderSkin extends E
}
};
+ private static final int DEFAULT_EXPAND_DURATION = 250;
+ private static final int DEFAULT_EXPAND_RATE = 30;
+
public TerraExpanderSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
setBackgroundColor(theme.getColor(4));
@@ -560,22 +564,6 @@ public class TerraExpanderSkin extends E
setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
- public int getExpandDuration() {
- return expandDuration;
- }
-
- public void setExpandDuration(int expandDuration) {
- this.expandDuration = expandDuration;
- }
-
- public int getExpandRate() {
- return expandRate;
- }
-
- public void setExpandRate(int expandRate) {
- this.expandRate = expandRate;
- }
-
public Insets getPadding() {
return padding;
}
@@ -613,6 +601,22 @@ public class TerraExpanderSkin extends E
setPadding(Insets.decode(padding));
}
+ public int getExpandDuration() {
+ return expandDuration;
+ }
+
+ public void setExpandDuration(int expandDuration) {
+ this.expandDuration = expandDuration;
+ }
+
+ public int getExpandRate() {
+ return expandRate;
+ }
+
+ public void setExpandRate(int expandRate) {
+ this.expandRate = expandRate;
+ }
+
// ButtonPressListener methods
/**
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=1002616&r1=1002615&r2=1002616&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 Sep 29 13:25:03 2010
@@ -180,6 +180,9 @@ public class TerraListButtonSkin extends
private Color disabledBorderColor;
private Insets padding;
+ private int closeTransitionDuration = DEFAULT_CLOSE_TRANSITION_DURATION;
+ private int closeTransitionRate = DEFAULT_CLOSE_TRANSITION_RATE;
+
private Color bevelColor;
private Color pressedBevelColor;
private Color disabledBevelColor;
@@ -190,8 +193,8 @@ public class TerraListButtonSkin extends
private static final int CORNER_RADIUS = 4;
private static final int TRIGGER_WIDTH = 14;
- private int closeTransitionDuration = 250;
- private int closeTransitionRate = 30;
+ private static final int DEFAULT_CLOSE_TRANSITION_DURATION = 250;
+ private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraListButtonSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
@@ -477,22 +480,6 @@ public class TerraListButtonSkin extends
setFont(Theme.deriveFont(font));
}
- public int getCloseTransitionDuration() {
- return closeTransitionDuration;
- }
-
- public void setCloseTransitionDuration(int closeTransitionDuration) {
- this.closeTransitionDuration = closeTransitionDuration;
- }
-
- public int getCloseTransitionRate() {
- return closeTransitionRate;
- }
-
- public void setCloseTransitionRate(int closeTransitionRate) {
- this.closeTransitionRate = closeTransitionRate;
- }
-
public Color getColor() {
return color;
}
@@ -694,6 +681,22 @@ public class TerraListButtonSkin extends
setPadding(Insets.decode(padding));
}
+ public int getCloseTransitionDuration() {
+ return closeTransitionDuration;
+ }
+
+ public void setCloseTransitionDuration(int closeTransitionDuration) {
+ this.closeTransitionDuration = closeTransitionDuration;
+ }
+
+ public int getCloseTransitionRate() {
+ return closeTransitionRate;
+ }
+
+ public void setCloseTransitionRate(int closeTransitionRate) {
+ this.closeTransitionRate = closeTransitionRate;
+ }
+
public Object getListFont() {
return listView.getStyles().get("font");
}
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=1002616&r1=1002615&r2=1002616&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 Sep 29 13:25:03 2010
@@ -389,22 +389,6 @@ public class TerraMenuButtonSkin extends
setFont(Theme.deriveFont(font));
}
- public int getCloseTransitionDuration() {
- return (Integer) menuPopup.getStyles().get("closeTransitionDuration");
- }
-
- public void setCloseTransitionDuration(int closeTransitionDuration) {
- menuPopup.getStyles().put("closeTransitionDuration", closeTransitionDuration);
- }
-
- public int getCloseTransitionRate() {
- return (Integer) menuPopup.getStyles().get("closeTransitionRate");
- }
-
- public void setCloseTransitionRate(int closeTransitionRate) {
- menuPopup.getStyles().put("closeTransitionRate", closeTransitionRate);
- }
-
public Color getColor() {
return color;
}
@@ -685,6 +669,22 @@ public class TerraMenuButtonSkin extends
repaintComponent();
}
+ public int getCloseTransitionDuration() {
+ return (Integer) menuPopup.getStyles().get("closeTransitionDuration");
+ }
+
+ public void setCloseTransitionDuration(int closeTransitionDuration) {
+ menuPopup.getStyles().put("closeTransitionDuration", closeTransitionDuration);
+ }
+
+ public int getCloseTransitionRate() {
+ return (Integer) menuPopup.getStyles().get("closeTransitionRate");
+ }
+
+ public void setCloseTransitionRate(int closeTransitionRate) {
+ menuPopup.getStyles().put("closeTransitionRate", closeTransitionRate);
+ }
+
@Override
public void mouseOut(Component component) {
super.mouseOut(component);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Wed Sep 29 13:25:03 2010
@@ -77,6 +77,9 @@ public class TerraMenuPopupSkin extends
private DropShadowDecorator dropShadowDecorator = null;
private Transition closeTransition = null;
+ private int closeTransitionDuration = DEFAULT_CLOSE_TRANSITION_DURATION;
+ private int closeTransitionRate = DEFAULT_CLOSE_TRANSITION_RATE;
+
private ContainerMouseListener displayMouseListener = new ContainerMouseListener.Adapter() {
@Override
public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
@@ -127,8 +130,8 @@ public class TerraMenuPopupSkin extends
}
};
- private int closeTransitionDuration = 250;
- private int closeTransitionRate = 30;
+ private static final int DEFAULT_CLOSE_TRANSITION_DURATION = 250;
+ private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraMenuPopupSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraRollupSkin.java Wed Sep 29 13:25:03 2010
@@ -170,8 +170,9 @@ public class TerraRollupSkin extends Rol
private boolean fill;
private boolean headingToggles;
- private int expandDuration = 250;
- private int expandRate = 30;
+ private int expandDuration = DEFAULT_EXPAND_DURATION;
+ private int expandRate = DEFAULT_EXPAND_RATE;
+
private ExpandTransition expandTransition = null;
private ComponentMouseButtonListener headingMouseButtonListener = new ComponentMouseButtonListener.Adapter() {
@@ -190,6 +191,9 @@ public class TerraRollupSkin extends Rol
}
};
+ private static final int DEFAULT_EXPAND_DURATION = 250;
+ private static final int DEFAULT_EXPAND_RATE = 30;
+
public TerraRollupSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
@@ -407,22 +411,6 @@ public class TerraRollupSkin extends Rol
invalidateComponent();
}
- public int getExpandDuration() {
- return expandDuration;
- }
-
- public void setExpandDuration(int expandDuration) {
- this.expandDuration = expandDuration;
- }
-
- public int getExpandRate() {
- return expandRate;
- }
-
- public void setExpandRate(int expandRate) {
- this.expandRate = expandRate;
- }
-
public boolean getFill() {
return fill;
}
@@ -440,6 +428,22 @@ public class TerraRollupSkin extends Rol
this.headingToggles = headingToggles;
}
+ public int getExpandDuration() {
+ return expandDuration;
+ }
+
+ public void setExpandDuration(int expandDuration) {
+ this.expandDuration = expandDuration;
+ }
+
+ public int getExpandRate() {
+ return expandRate;
+ }
+
+ public void setExpandRate(int expandRate) {
+ this.expandRate = expandRate;
+ }
+
@Override
public void headingChanged(Rollup rollup, Component previousHeading) {
if (previousHeading != null) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Wed Sep 29 13:25:03 2010
@@ -146,6 +146,9 @@ public class TerraSheetSkin extends Wind
private Insets padding;
private boolean resizable;
+ private int stateTransitionDuration = DEFAULT_STATE_TRANSITION_DURATION;
+ private int stateTransitionRate = DEFAULT_STATE_TRANSITION_RATE;
+
private Color bevelColor;
private OpenTransition openTransition = null;
@@ -220,8 +223,8 @@ public class TerraSheetSkin extends Wind
private DropShadowDecorator dropShadowDecorator = null;
- private int stateTransitionDuration = 300;
- private int stateTransitionRate = 30;
+ private static final int DEFAULT_STATE_TRANSITION_DURATION = 300;
+ private static final int DEFAULT_STATE_TRANSITION_RATE = 30;
public TerraSheetSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Wed Sep 29 13:25:03 2010
@@ -61,6 +61,9 @@ public class TerraSuggestionPopupSkin ex
private DropShadowDecorator dropShadowDecorator = null;
private Transition closeTransition = null;
+ private int closeTransitionDuration = DEFAULT_CLOSE_TRANSITION_DURATION;
+ private int closeTransitionRate = DEFAULT_CLOSE_TRANSITION_RATE;
+
private ContainerMouseListener displayMouseListener = new ContainerMouseListener.Adapter() {
@Override
public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
@@ -138,8 +141,8 @@ public class TerraSuggestionPopupSkin ex
}
};
- private int closeTransitionDuration = 150;
- private int closeTransitionRate = 30;
+ private static final int DEFAULT_CLOSE_TRANSITION_DURATION = 150;
+ private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraSuggestionPopupSkin () {
suggestionListView.getStyles().put("variableItemHeight", true);
@@ -190,22 +193,6 @@ public class TerraSuggestionPopupSkin ex
setFont(Theme.deriveFont(font));
}
- public int getCloseTransitionDuration() {
- return closeTransitionDuration;
- }
-
- public void setCloseTransitionDuration(int closeTransitionDuration) {
- this.closeTransitionDuration = closeTransitionDuration;
- }
-
- public int getCloseTransitionRate() {
- return closeTransitionRate;
- }
-
- public void setCloseTransitionRate(int closeTransitionRate) {
- this.closeTransitionRate = closeTransitionRate;
- }
-
public Color getColor() {
return (Color)suggestionListView.getStyles().get("color");
}
@@ -238,6 +225,22 @@ public class TerraSuggestionPopupSkin ex
setBorderColor(GraphicsUtilities.decodeColor(borderColor));
}
+ public int getCloseTransitionDuration() {
+ return closeTransitionDuration;
+ }
+
+ public void setCloseTransitionDuration(int closeTransitionDuration) {
+ this.closeTransitionDuration = closeTransitionDuration;
+ }
+
+ public int getCloseTransitionRate() {
+ return closeTransitionRate;
+ }
+
+ public void setCloseTransitionRate(int closeTransitionRate) {
+ this.closeTransitionRate = closeTransitionRate;
+ }
+
@Override
public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
SuggestionPopup suggestionPopup = (SuggestionPopup)getComponent();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Wed Sep 29 13:25:03 2010
@@ -519,6 +519,9 @@ public class TerraTabPaneSkin extends Co
private Orientation tabOrientation = Orientation.HORIZONTAL;
+ private int selectionChangeDuration = DEFAULT_SELECTION_CHANGE_DURATION;
+ private int selectionChangeRate = DEFAULT_SELECTION_CHANGE_RATE;
+
private SelectionChangeTransition selectionChangeTransition = null;
private ClipDecorator clipDecorator = new ClipDecorator();
@@ -531,12 +534,12 @@ public class TerraTabPaneSkin extends Co
}
};
- private int selectionChangeDuration = 250;
- private int selectionChangeRate = 30;
public static final int CORNER_RADIUS = 4;
public static final int GRADIENT_BEVEL_THICKNESS = 8;
private static final int CLOSE_TRIGGER_SIZE = 6;
+ private static final int DEFAULT_SELECTION_CHANGE_DURATION = 250;
+ private static final int DEFAULT_SELECTION_CHANGE_RATE = 30;
public TerraTabPaneSkin() {
TerraTheme theme = (TerraTheme)Theme.getTheme();
@@ -1258,22 +1261,6 @@ public class TerraTabPaneSkin extends Co
tabButtonBoxPane.getStyles().put("spacing", buttonSpacing);
}
- public int getSelectionChangeDuration() {
- return selectionChangeDuration;
- }
-
- public void setSelectionChangeDuration(int selectionChangeDuration) {
- this.selectionChangeDuration = selectionChangeDuration;
- }
-
- public int getSelectionChangeRate() {
- return selectionChangeRate;
- }
-
- public void setSelectionChangeRate(int selectionChangeRate) {
- this.selectionChangeRate = selectionChangeRate;
- }
-
public Orientation getTabOrientation() {
return tabOrientation;
}
@@ -1305,6 +1292,22 @@ public class TerraTabPaneSkin extends Co
}
}
+ public int getSelectionChangeDuration() {
+ return selectionChangeDuration;
+ }
+
+ public void setSelectionChangeDuration(int selectionChangeDuration) {
+ this.selectionChangeDuration = selectionChangeDuration;
+ }
+
+ public int getSelectionChangeRate() {
+ return selectionChangeRate;
+ }
+
+ public void setSelectionChangeRate(int selectionChangeRate) {
+ this.selectionChangeRate = selectionChangeRate;
+ }
+
/**
* Key presses have no effect if the event has already been consumed.<p>
* CommandModifier + {@link KeyCode#KEYPAD_1 KEYPAD_1} to
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTooltipSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTooltipSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTooltipSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTooltipSkin.java Wed Sep 29 13:25:03 2010
@@ -93,8 +93,11 @@ public class TerraTooltipSkin extends Wi
private Color borderColor;
private Insets padding;
- private int closeTransitionDuration = 500;
- private int closeTransitionRate = 30;
+ private int closeTransitionDuration = DEFAULT_CLOSE_TRANSITION_DURATION;
+ private int closeTransitionRate = DEFAULT_CLOSE_TRANSITION_RATE;
+
+ private static final int DEFAULT_CLOSE_TRANSITION_DURATION = 500;
+ private static final int DEFAULT_CLOSE_TRANSITION_RATE = 30;
public TerraTooltipSkin() {
setBackgroundColor(new Color(0xff, 0xff, 0xe0, 0xf0));
@@ -173,22 +176,6 @@ public class TerraTooltipSkin extends Wi
return new Dimensions(preferredWidth, preferredHeight);
}
- public int getCloseTransitionDuration() {
- return closeTransitionDuration;
- }
-
- public void setCloseTransitionDuration(int closeTransitionDuration) {
- this.closeTransitionDuration = closeTransitionDuration;
- }
-
- public int getCloseTransitionRate() {
- return closeTransitionRate;
- }
-
- public void setCloseTransitionRate(int closeTransitionRate) {
- this.closeTransitionRate = closeTransitionRate;
- }
-
@Override
public void layout() {
Tooltip tooltip = (Tooltip)getComponent();
@@ -213,6 +200,22 @@ public class TerraTooltipSkin extends Wi
GraphicsUtilities.drawRect(graphics, 0, 0, width, height);
}
+ public int getCloseTransitionDuration() {
+ return closeTransitionDuration;
+ }
+
+ public void setCloseTransitionDuration(int closeTransitionDuration) {
+ this.closeTransitionDuration = closeTransitionDuration;
+ }
+
+ public int getCloseTransitionRate() {
+ return closeTransitionRate;
+ }
+
+ public void setCloseTransitionRate(int closeTransitionRate) {
+ this.closeTransitionRate = closeTransitionRate;
+ }
+
@Override
public void windowOpened(Window window) {
super.windowOpened(window);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=1002616&r1=1002615&r2=1002616&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Wed Sep 29 13:25:03 2010
@@ -294,12 +294,15 @@ public class CardPaneSkin extends Contai
private Insets padding = Insets.NONE;
private boolean sizeToSelection = false;
private SelectionChangeEffect selectionChangeEffect = null;
- private int selectionChangeDuration = 250;
- private int selectionChangeRate = 30;
+ private int selectionChangeDuration = DEFAULT_SELECTION_CHANGE_DURATION;
+ private int selectionChangeRate = DEFAULT_SELECTION_CHANGE_RATE;
private boolean circular = false;
private SelectionChangeTransition selectionChangeTransition = null;
+ private static final int DEFAULT_SELECTION_CHANGE_DURATION = 250;
+ private static final int DEFAULT_SELECTION_CHANGE_RATE = 30;
+
@Override
public void install(Component component) {
super.install(component);