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 2009/05/13 14:43:24 UTC
svn commit: r774295 - in /incubator/pivot/trunk:
tutorials/src/pivot/tutorials/layout/ wtk/src/pivot/wtk/skin/
wtk/src/pivot/wtk/skin/terra/
Author: gbrown
Date: Wed May 13 12:43:24 2009
New Revision: 774295
URL: http://svn.apache.org/viewvc?rev=774295&view=rev
Log:
Minor fixes to CardPaneSkin and TerraTooltipSkin; rename some WTKX files in tutorials project for consistency with naming conventions.
Added:
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/flow_panes.wtkx
- copied unchanged from r774141, incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/flowpanes.wtkx
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/stack_panes.wtkx
- copied unchanged from r774141, incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/stackpanes.wtkx
Removed:
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/flowpanes.wtkx
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/stackpanes.wtkx
Modified:
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/CardPaneSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTooltipSkin.java
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java?rev=774295&r1=774294&r2=774295&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java Wed May 13 12:43:24 2009
@@ -31,7 +31,7 @@
import pivot.wtkx.Bindable;
public class FlowPanes extends Bindable implements Application {
- @Load(name="flowpanes.wtkx") private Window window;
+ @Load(name="flow_panes.wtkx") private Window window;
@Bind(property="window") private FlowPane flowPane;
@Bind(property="window") private RadioButton horizontalOrientationButton;
@Bind(property="window") private RadioButton verticalOrientationButton;
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java?rev=774295&r1=774294&r2=774295&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java Wed May 13 12:43:24 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class StackPanes extends Bindable implements Application {
- @Load(name="stackpanes.wtkx") private Window window;
+ @Load(name="stack_panes.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/CardPaneSkin.java?rev=774295&r1=774294&r2=774295&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/CardPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/CardPaneSkin.java Wed May 13 12:43:24 2009
@@ -363,7 +363,7 @@
if (selectionChangeTransition.isRunning()) {
for (Component card : cardPane) {
- // Center old and new cards and ensure they are visible
+ // Align old and new cards and ensure they are visible
if (card == previousSelectedCard
|| card == selectedCard) {
int x = (orientation == Orientation.VERTICAL) ?
@@ -438,7 +438,7 @@
}
} else {
for (Component card : cardPane) {
- width = Math.max(height, card.getPreferredWidth(height));
+ width = Math.max(width, card.getPreferredWidth(height));
}
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTooltipSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTooltipSkin.java?rev=774295&r1=774294&r2=774295&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTooltipSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraTooltipSkin.java Wed May 13 12:43:24 2009
@@ -35,7 +35,6 @@
import pivot.wtk.TooltipListener;
import pivot.wtk.Window;
import pivot.wtk.effects.DropShadowDecorator;
-import pivot.wtk.effects.FadeTransition;
import pivot.wtk.effects.Transition;
import pivot.wtk.effects.TransitionListener;
import pivot.wtk.skin.WindowSkin;
@@ -171,8 +170,9 @@
Vote vote = Vote.APPROVE;
if (closeTransition == null) {
- closeTransition = new FadeTransition(window,
- CLOSE_TRANSITION_DURATION, CLOSE_TRANSITION_RATE);
+ closeTransition = new FadeWindowTransition(window,
+ CLOSE_TRANSITION_DURATION, CLOSE_TRANSITION_RATE,
+ dropShadowDecorator);
closeTransition.start(new TransitionListener() {
public void transitionCompleted(Transition transition) {