https://issues.apache.org/jira/browse/PIVOT-534
2 points for consideration 1. Of the 5 navigation containers, 3 have transition styles named 'selectionChangeXXX', while 2 have 'expandXXX'. For consistency, should 'expandXXX' be renamed to 'selectionChangeXXX' for TerraExpanderSkin & TerraRollupSkin? selectionChangeDuration / selectionChangeRate - CardPaneSkin - TerraAccordionSkin - TerraTabPaneSkin expandDuration / expandRate - TerraExpanderSkin - TerraRollupSkin 2. The following 7 skins have transition styles named 'closeTransitionXXX'. These transitions are only used when closing the window/popup. Should TerraSheetSkin have its transition styles renamed from 'transitionXXX' to 'openCloseTransitionXXX' to indicate that the style values are used for both opening & closing a sheet? closeTransitionDuration / closeTransitionRate - TerraCalendarButtonSkin - TerraColorChooserButtonSkin - TerraListButtonSkin - TerraMenuButtonSkin - TerraMenuPopupSkin - TerraSuggestionPopupSkin - TerraTooltipSkin transitionDuration / transitionRate - TerraSheetSkin On 25 September 2010 02:15, <[email protected]> wrote: > Author: cbartlett > Date: Fri Sep 24 19:15:26 2010 > New Revision: 1001032 > > URL: http://svn.apache.org/viewvc?rev=1001032&view=rev > Log: > PIVOT-534 - Expose transition durations & rates as 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=1001032&r1=1001031&r2=1001032&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 Sep 24 19:15:26 2010 > @@ -247,7 +247,7 @@ public class TerraAccordionSkin extends > private Easing easing = new Quartic(); > > public SelectionChangeTransition(Component fromPanel, Component > toPanel) { > - super(SELECTION_CHANGE_DURATION, SELECTION_CHANGE_RATE, > false); > + super(selectionChangeDuration, selectionChangeRate, false); > this.fromPanel = fromPanel; > this.toPanel = toPanel; > } > @@ -310,8 +310,8 @@ public class TerraAccordionSkin extends > > public static final int GRADIENT_BEVEL_THICKNESS = 4; > > - private static final int SELECTION_CHANGE_DURATION = 250; > - private static final int SELECTION_CHANGE_RATE = 30; > + private int selectionChangeDuration = 250; > + private int selectionChangeRate = 30; > > public TerraAccordionSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > @@ -731,6 +731,22 @@ public class TerraAccordionSkin extends > setButtonPadding(new Insets(buttonPadding)); > } > > + 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/TerraCalendarButtonSkin.java > URL: > http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -103,8 +103,8 @@ public class TerraCalendarButtonSkin ext > Vote vote = Vote.APPROVE; > > if (closeTransition == null) { > - closeTransition = new FadeWindowTransition(window, > CLOSE_TRANSITION_DURATION, > - CLOSE_TRANSITION_RATE, dropShadowDecorator); > + closeTransition = new FadeWindowTransition(window, > closeTransitionDuration, > + closeTransitionRate, dropShadowDecorator); > > closeTransition.start(new TransitionListener() { > @Override > @@ -159,8 +159,8 @@ public class TerraCalendarButtonSkin ext > private static final int CORNER_RADIUS = 4; > private static final int TRIGGER_WIDTH = 10; > > - private static final int CLOSE_TRANSITION_DURATION = 250; > - private static final int CLOSE_TRANSITION_RATE = 30; > + private int closeTransitionDuration = 250; > + private int closeTransitionRate = 30; > > public TerraCalendarButtonSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > @@ -382,6 +382,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -30,11 +30,11 @@ import org.apache.pivot.util.Vote; > import org.apache.pivot.wtk.Border; > import org.apache.pivot.wtk.Bounds; > import org.apache.pivot.wtk.Button; > +import org.apache.pivot.wtk.ColorChooserButton; > import org.apache.pivot.wtk.Dimensions; > import org.apache.pivot.wtk.Display; > import org.apache.pivot.wtk.GraphicsUtilities; > import org.apache.pivot.wtk.Insets; > -import org.apache.pivot.wtk.ColorChooserButton; > import org.apache.pivot.wtk.Point; > import org.apache.pivot.wtk.Theme; > import org.apache.pivot.wtk.Window; > @@ -97,8 +97,8 @@ public class TerraColorChooserButtonSkin > Vote vote = Vote.APPROVE; > > if (closeTransition == null) { > - closeTransition = new FadeWindowTransition(window, > CLOSE_TRANSITION_DURATION, > - CLOSE_TRANSITION_RATE, dropShadowDecorator); > + closeTransition = new FadeWindowTransition(window, > closeTransitionDuration, > + closeTransitionRate, dropShadowDecorator); > > closeTransition.start(new TransitionListener() { > @Override > @@ -153,8 +153,8 @@ public class TerraColorChooserButtonSkin > private static final int CORNER_RADIUS = 4; > private static final int TRIGGER_WIDTH = 10; > > - private static final int CLOSE_TRANSITION_DURATION = 250; > - private static final int CLOSE_TRANSITION_RATE = 30; > + private int closeTransitionDuration = 250; > + private int closeTransitionRate = 30; > > public TerraColorChooserButtonSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > @@ -386,6 +386,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 Sep 24 19:15:26 2010 > @@ -63,7 +63,7 @@ public class TerraExpanderSkin extends E > private Easing easing = new Quadratic(); > > public ExpandTransition(boolean reversed) { > - super(EXPAND_DURATION, EXPAND_RATE, false, reversed); > + super(expandDuration, expandRate, false, reversed); > } > > public float getScale() { > @@ -194,6 +194,8 @@ public class TerraExpanderSkin extends E > > private Color titleBarBevelColor; > > + private int expandDuration = 250; > + private int expandRate = 30; > private ExpandTransition expandTransition = null; > private ClipDecorator clipDecorator = new ClipDecorator(); > > @@ -215,9 +217,6 @@ public class TerraExpanderSkin extends E > } > }; > > - private static final int EXPAND_DURATION = 250; > - private static final int EXPAND_RATE = 30; > - > public TerraExpanderSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > setBackgroundColor(theme.getColor(4)); > @@ -561,6 +560,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -136,7 +136,7 @@ public class TerraListButtonSkin extends > > if (closeTransition == null) { > closeTransition = new FadeWindowTransition(window, > - CLOSE_TRANSITION_DURATION, CLOSE_TRANSITION_RATE, > + closeTransitionDuration, closeTransitionRate, > dropShadowDecorator); > > closeTransition.start(new TransitionListener() { > @@ -194,8 +194,8 @@ public class TerraListButtonSkin extends > private static final int CORNER_RADIUS = 4; > private static final int TRIGGER_WIDTH = 14; > > - private static final int CLOSE_TRANSITION_DURATION = 250; > - private static final int CLOSE_TRANSITION_RATE = 30; > + private int closeTransitionDuration = 250; > + private int closeTransitionRate = 30; > > public TerraListButtonSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > @@ -481,6 +481,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -391,6 +391,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -127,8 +127,8 @@ public class TerraMenuPopupSkin extends > } > }; > > - private static final int CLOSE_TRANSITION_DURATION = 250; > - private static final int CLOSE_TRANSITION_RATE = 30; > + private int closeTransitionDuration = 250; > + private int closeTransitionRate = 30; > > public TerraMenuPopupSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > @@ -181,6 +181,22 @@ public class TerraMenuPopupSkin extends > border.getStyles().put("color", 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; > + } > + > /** > * {...@link KeyCode#ESCAPE ESCAPE} Close the menu popup. > */ > @@ -254,7 +270,7 @@ public class TerraMenuPopupSkin extends > border.setEnabled(false); > > closeTransition = new FadeWindowTransition(menuPopup, > - CLOSE_TRANSITION_DURATION, CLOSE_TRANSITION_RATE, > + closeTransitionDuration, closeTransitionRate, > dropShadowDecorator); > > closeTransition.start(new TransitionListener() { > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -49,7 +49,7 @@ public class TerraRollupSkin extends Rol > private Easing easing = new Quadratic(); > > public ExpandTransition(boolean reversed) { > - super(EXPAND_DURATION, EXPAND_RATE, false, reversed); > + super(expandDuration, expandRate, false, reversed); > } > > public float getScale() { > @@ -170,6 +170,8 @@ public class TerraRollupSkin extends Rol > private boolean fill; > private boolean headingToggles; > > + private int expandDuration = 250; > + private int expandRate = 30; > private ExpandTransition expandTransition = null; > > private ComponentMouseButtonListener headingMouseButtonListener = new > ComponentMouseButtonListener.Adapter() { > @@ -188,9 +190,6 @@ public class TerraRollupSkin extends Rol > } > }; > > - private static final int EXPAND_DURATION = 250; > - private static final int EXPAND_RATE = 30; > - > public TerraRollupSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > > @@ -408,6 +407,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -59,7 +59,7 @@ public class TerraSheetSkin extends Wind > private int dy = 0; > > public OpenTransition(boolean reversed) { > - super(TRANSITION_DURATION, TRANSITION_RATE, false, reversed); > + super(transitionDuration, transitionRate, false, reversed); > } > > @Override > @@ -220,8 +220,8 @@ public class TerraSheetSkin extends Wind > > private DropShadowDecorator dropShadowDecorator = null; > > - private static final int TRANSITION_DURATION = 300; > - private static final int TRANSITION_RATE = 30; > + private int transitionDuration = 300; > + private int transitionRate = 30; > > public TerraSheetSkin() { > TerraTheme theme = (TerraTheme)Theme.getTheme(); > @@ -556,6 +556,22 @@ public class TerraSheetSkin extends Wind > invalidateComponent(); > } > > + public int getTransitionDuration() { > + return transitionDuration; > + } > + > + public void setTransitionDuration(int transitionDuration) { > + this.transitionDuration = transitionDuration; > + } > + > + public int getTransitionRate() { > + return transitionRate; > + } > + > + public void setTransitionRate(int transitionRate) { > + this.transitionRate = transitionRate; > + } > + > @Override > public void windowOpened(Window window) { > super.windowOpened(window); > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -138,8 +138,8 @@ public class TerraSuggestionPopupSkin ex > } > }; > > - private static final int CLOSE_TRANSITION_DURATION = 150; > - private static final int CLOSE_TRANSITION_RATE = 30; > + private int closeTransitionDuration = 150; > + private int closeTransitionRate = 30; > > public TerraSuggestionPopupSkin () { > suggestionListView.getStyles().put("variableItemHeight", true); > @@ -190,6 +190,22 @@ 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"); > } > @@ -342,7 +358,7 @@ public class TerraSuggestionPopupSkin ex > suggestionListViewBorder.setEnabled(false); > > closeTransition = new FadeWindowTransition(suggestionPopup, > - CLOSE_TRANSITION_DURATION, CLOSE_TRANSITION_RATE, > + closeTransitionDuration, closeTransitionRate, > dropShadowDecorator); > > closeTransition.start(new TransitionListener() { > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -441,7 +441,7 @@ public class TerraTabPaneSkin extends Co > private Easing easing = new Quadratic(); > > public SelectionChangeTransition(int index, boolean expand) { > - super(SELECTION_CHANGE_DURATION, SELECTION_CHANGE_RATE, > false); > + super(selectionChangeDuration, selectionChangeRate, false); > > this.index = index; > this.expand = expand; > @@ -531,8 +531,8 @@ public class TerraTabPaneSkin extends Co > } > }; > > - private static final int SELECTION_CHANGE_DURATION = 250; > - private static final int SELECTION_CHANGE_RATE = 30; > + private int selectionChangeDuration = 250; > + private int selectionChangeRate = 30; > > public static final int CORNER_RADIUS = 4; > public static final int GRADIENT_BEVEL_THICKNESS = 8; > @@ -1258,6 +1258,22 @@ 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; > } > > 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=1001032&r1=1001031&r2=1001032&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 > Fri Sep 24 19:15:26 2010 > @@ -93,8 +93,8 @@ public class TerraTooltipSkin extends Wi > private Color borderColor; > private Insets padding; > > - private static final int CLOSE_TRANSITION_DURATION = 500; > - private static final int CLOSE_TRANSITION_RATE = 30; > + private int closeTransitionDuration = 500; > + private int closeTransitionRate = 30; > > public TerraTooltipSkin() { > setBackgroundColor(new Color(0xff, 0xff, 0xe0, 0xf0)); > @@ -173,6 +173,22 @@ 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(); > @@ -214,7 +230,7 @@ public class TerraTooltipSkin extends Wi > if (fade) { > if (closeTransition == null) { > closeTransition = new FadeWindowTransition(window, > - CLOSE_TRANSITION_DURATION, CLOSE_TRANSITION_RATE, > + closeTransitionDuration, closeTransitionRate, > dropShadowDecorator); > > closeTransition.start(new TransitionListener() { > > 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=1001032&r1=1001031&r2=1001032&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 Fri Sep > 24 19:15:26 2010 > @@ -60,7 +60,7 @@ public class CardPaneSkin extends Contai > public final int direction; > > public SelectionChangeTransition(int from, int to) { > - super(selectionChangeDuration, SELECTION_CHANGE_RATE, false); > + super(selectionChangeDuration, selectionChangeRate, false); > > this.from = from; > this.to = to; > @@ -294,14 +294,12 @@ public class CardPaneSkin extends Contai > private Insets padding = Insets.NONE; > private boolean sizeToSelection = false; > private SelectionChangeEffect selectionChangeEffect = null; > - private int selectionChangeDuration = > DEFAULT_SELECTION_CHANGE_DURATION; > + private int selectionChangeDuration = 250; > + private int selectionChangeRate = 30; > private boolean circular = false; > > private SelectionChangeTransition selectionChangeTransition = null; > > - public static final int DEFAULT_SELECTION_CHANGE_DURATION = 250; > - public static final int SELECTION_CHANGE_RATE = 30; > - > @Override > public void install(Component component) { > super.install(component); > @@ -566,6 +564,13 @@ public class CardPaneSkin extends Contai > this.selectionChangeDuration = selectionChangeDuration; > } > > + public int getSelectionChangeRate() { > + return selectionChangeRate; > + } > + > + public void setSelectionChangeRate(int selectionChangeRate) { > + this.selectionChangeRate = selectionChangeRate; > + } > /** > * Sets the circular style, which controls the direction of certain > * transitions (transitions for which a direction makes sense) when > looping > > >
