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/07/28 19:59:43 UTC

svn commit: r798623 - in /incubator/pivot/trunk: tutorials/src/org/apache/pivot/tutorials/navigation/ tutorials/www/ wtk/src/org/apache/pivot/wtk/content/ wtk/src/org/apache/pivot/wtk/effects/ wtk/src/org/apache/pivot/wtk/skin/

Author: gbrown
Date: Tue Jul 28 17:59:43 2009
New Revision: 798623

URL: http://svn.apache.org/viewvc?rev=798623&view=rev
Log:
Add a horizontal flip transition to CardPaneSkin.

Modified:
    incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
    incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/card_panes.wtkx
    incubator/pivot/trunk/tutorials/www/card_panes.template.html
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java

Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java?rev=798623&r1=798622&r2=798623&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java Tue Jul 28 17:59:43 2009
@@ -41,7 +41,8 @@
     private RadioButton crossfadeRadioButton = null;
     private RadioButton horizontalSlideRadioButton = null;
     private RadioButton verticalSlideRadioButton = null;
-    private RadioButton flipRadioButton = null;
+    private RadioButton horizontalFlipRadioButton = null;
+    private RadioButton verticalFlipRadioButton = null;
     private RadioButton zoomRadioButton = null;
     private RadioButton noneRadioButton = null;
 
@@ -56,7 +57,8 @@
         crossfadeRadioButton = (RadioButton)wtkxSerializer.get("crossfadeRadioButton");
         horizontalSlideRadioButton = (RadioButton)wtkxSerializer.get("horizontalSlideRadioButton");
         verticalSlideRadioButton = (RadioButton)wtkxSerializer.get("verticalSlideRadioButton");
-        flipRadioButton = (RadioButton)wtkxSerializer.get("flipRadioButton");
+        horizontalFlipRadioButton = (RadioButton)wtkxSerializer.get("horizontalFlipRadioButton");
+        verticalFlipRadioButton = (RadioButton)wtkxSerializer.get("verticalFlipRadioButton");
         zoomRadioButton = (RadioButton)wtkxSerializer.get("zoomRadioButton");
         noneRadioButton = (RadioButton)wtkxSerializer.get("noneRadioButton");
 
@@ -97,7 +99,8 @@
         crossfadeRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         horizontalSlideRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         verticalSlideRadioButton.getButtonStateListeners().add(radioButtonStateListener);
-        flipRadioButton.getButtonStateListeners().add(radioButtonStateListener);
+        horizontalFlipRadioButton.getButtonStateListeners().add(radioButtonStateListener);
+        verticalFlipRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         zoomRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         noneRadioButton.getButtonStateListeners().add(radioButtonStateListener);
 
@@ -133,9 +136,12 @@
         } else if (verticalSlideRadioButton.isSelected()) {
             cardPane.getStyles().put("selectionChangeEffect",
                 CardPaneSkin.SelectionChangeEffect.VERTICAL_SLIDE);
-        } else if (flipRadioButton.isSelected()) {
+        } else if (horizontalFlipRadioButton.isSelected()) {
             cardPane.getStyles().put("selectionChangeEffect",
-                CardPaneSkin.SelectionChangeEffect.FLIP);
+                CardPaneSkin.SelectionChangeEffect.HORIZONTAL_FLIP);
+        } else if (verticalFlipRadioButton.isSelected()) {
+            cardPane.getStyles().put("selectionChangeEffect",
+                CardPaneSkin.SelectionChangeEffect.VERTICAL_FLIP);
         } else if (zoomRadioButton.isSelected()) {
             cardPane.getStyles().put("selectionChangeEffect",
                 CardPaneSkin.SelectionChangeEffect.ZOOM);

Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/card_panes.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/card_panes.wtkx?rev=798623&r1=798622&r2=798623&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/card_panes.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/card_panes.wtkx Tue Jul 28 17:59:43 2009
@@ -73,7 +73,9 @@
                                     group="selectionChangeEffect"/>
                                 <RadioButton wtkx:id="verticalSlideRadioButton" buttonData="Vertical Slide"
                                     group="selectionChangeEffect"/>
-                                <RadioButton wtkx:id="flipRadioButton" buttonData="Flip"
+                                <RadioButton wtkx:id="horizontalFlipRadioButton" buttonData="Horizontal Flip"
+                                    group="selectionChangeEffect"/>
+                                <RadioButton wtkx:id="verticalFlipRadioButton" buttonData="Vertical Flip"
                                     group="selectionChangeEffect"/>
                                 <RadioButton wtkx:id="zoomRadioButton" buttonData="Zoom"
                                     group="selectionChangeEffect"/>

Modified: incubator/pivot/trunk/tutorials/www/card_panes.template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/card_panes.template.html?rev=798623&r1=798622&r2=798623&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/www/card_panes.template.html (original)
+++ incubator/pivot/trunk/tutorials/www/card_panes.template.html Tue Jul 28 17:59:43 2009
@@ -44,7 +44,8 @@
 <li>Crossfade</li>
 <li>Horizontal slide ("wipe" left/right)</li>
 <li>Vertical slide ("wipe" up/down)</li>
-<li>Flip</li>
+<li>Horizonal Flip</li>
+<li>Vertical Flip</li>
 <li>Zoom</li>
 </ul>
 
@@ -122,7 +123,9 @@
                                     group="selectionChangeEffect"/&gt;
                                 &lt;RadioButton wtkx:id="verticalSlideRadioButton" buttonData="Vertical Slide"
                                     group="selectionChangeEffect"/&gt;
-                                &lt;RadioButton wtkx:id="flipRadioButton" buttonData="Flip"
+                                &lt;RadioButton wtkx:id="horizontalFlipRadioButton" buttonData="Horizontal Flip"
+                                    group="selectionChangeEffect"/&gt;
+                                &lt;RadioButton wtkx:id="verticalFlipRadioButton" buttonData="Vertical Flip"
                                     group="selectionChangeEffect"/&gt;
                                 &lt;RadioButton wtkx:id="noneRadioButton" buttonData="None"
                                     group="selectionChangeEffect"/&gt;
@@ -166,7 +169,8 @@
     private RadioButton crossfadeRadioButton = null;
     private RadioButton horizontalSlideRadioButton = null;
     private RadioButton verticalSlideRadioButton = null;
-    private RadioButton flipRadioButton = null;
+    private RadioButton horizontalFlipRadioButton = null;
+    private RadioButton verticalFlipRadioButton = null;
     private RadioButton noneRadioButton = null;
 
     public void startup(Display display, Map&lt;String, String&gt; properties)
@@ -180,7 +184,8 @@
         crossfadeRadioButton = (RadioButton)wtkxSerializer.get("crossfadeRadioButton");
         horizontalSlideRadioButton = (RadioButton)wtkxSerializer.get("horizontalSlideRadioButton");
         verticalSlideRadioButton = (RadioButton)wtkxSerializer.get("verticalSlideRadioButton");
-        flipRadioButton = (RadioButton)wtkxSerializer.get("flipRadioButton");
+        horizontalFlipRadioButton = (RadioButton)wtkxSerializer.get("horizontalFlipRadioButton");
+        verticalFlipRadioButton = (RadioButton)wtkxSerializer.get("verticalFlipRadioButton");
         noneRadioButton = (RadioButton)wtkxSerializer.get("noneRadioButton");
 
         cardPane.getCardPaneListeners().add(new CardPaneListener.Adapter() {
@@ -220,7 +225,8 @@
         crossfadeRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         horizontalSlideRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         verticalSlideRadioButton.getButtonStateListeners().add(radioButtonStateListener);
-        flipRadioButton.getButtonStateListeners().add(radioButtonStateListener);
+        horizontalFlipRadioButton.getButtonStateListeners().add(radioButtonStateListener);
+        verticalFlipRadioButton.getButtonStateListeners().add(radioButtonStateListener);
         noneRadioButton.getButtonStateListeners().add(radioButtonStateListener);
 
         updateCardPane();
@@ -255,9 +261,12 @@
         } else if (verticalSlideRadioButton.isSelected()) {
             cardPane.getStyles().put("selectionChangeEffect",
                 CardPaneSkin.SelectionChangeEffect.VERTICAL_SLIDE);
-        } else if (flipRadioButton.isSelected()) {
+        } else if (horizontalFlipRadioButton.isSelected()) {
+            cardPane.getStyles().put("selectionChangeEffect",
+                CardPaneSkin.SelectionChangeEffect.HORIZONTAL_FLIP);
+        } else if (verticalFlipRadioButton.isSelected()) {
             cardPane.getStyles().put("selectionChangeEffect",
-                CardPaneSkin.SelectionChangeEffect.FLIP);
+                CardPaneSkin.SelectionChangeEffect.VERTICAL_FLIP);
         } else {
             cardPane.getStyles().put("selectionChangeEffect", null);
         }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java?rev=798623&r1=798622&r2=798623&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java Tue Jul 28 17:59:43 2009
@@ -161,7 +161,7 @@
             });
 
             // Flip to the editor card
-            editorCardPane.getStyles().put("selectionChangeEffect", CardPaneSkin.SelectionChangeEffect.FLIP);
+            editorCardPane.getStyles().put("selectionChangeEffect", CardPaneSkin.SelectionChangeEffect.VERTICAL_FLIP);
             editorCardPane.setSelectedIndex(EDITOR_CARD_INDEX);
         }
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java?rev=798623&r1=798622&r2=798623&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java Tue Jul 28 17:59:43 2009
@@ -58,8 +58,7 @@
      * The amount to scale the component's y-axis
      */
     public ScaleDecorator(float scaleX, float scaleY) {
-        setScaleX(scaleX);
-        setScaleY(scaleY);
+        setScale(scaleX, scaleY);
     }
 
     /**
@@ -81,11 +80,7 @@
      * The amount to scale the component's x-axis
      */
     public void setScaleX(float scaleX) {
-        if (scaleX < 0) {
-            throw new IllegalArgumentException("scaleX is negative.");
-        }
-
-        this.scaleX = scaleX;
+        setScale(scaleX, scaleY);
     }
 
     /**
@@ -122,11 +117,7 @@
      * The amount to scale the component's y-axis
      */
     public void setScaleY(float scaleY) {
-        if (scaleY < 0) {
-            throw new IllegalArgumentException("scaleY is negative.");
-        }
-
-        this.scaleY = scaleY;
+        setScale(scaleX, scaleY);
     }
 
     /**
@@ -145,6 +136,29 @@
     }
 
     /**
+     * Sets the amount by which drawing operations will be scaled along the
+     * x and y axes.
+     *
+     * @param scaleX
+     * The amount to scale the component's x-axis.
+     *
+     * @param scaleY
+     * The amount to scale the component's y-axis.
+     */
+    public void setScale(float scaleX, float scaleY) {
+        if (scaleX < 0) {
+            throw new IllegalArgumentException("scaleX is negative.");
+        }
+
+        if (scaleY < 0) {
+            throw new IllegalArgumentException("scaleY is negative.");
+        }
+
+        this.scaleX = scaleX;
+        this.scaleY = scaleY;
+    }
+
+    /**
      * Sets the amount by which drawing operations will be scaled along both
      * the x and y axes.
      *

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=798623&r1=798622&r2=798623&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Tue Jul 28 17:59:43 2009
@@ -25,6 +25,7 @@
 import org.apache.pivot.wtk.Container;
 import org.apache.pivot.wtk.Dimensions;
 import org.apache.pivot.wtk.Insets;
+import org.apache.pivot.wtk.Orientation;
 import org.apache.pivot.wtk.effects.FadeDecorator;
 import org.apache.pivot.wtk.effects.ScaleDecorator;
 import org.apache.pivot.wtk.effects.Transition;
@@ -47,7 +48,8 @@
         CROSSFADE,
         HORIZONTAL_SLIDE,
         VERTICAL_SLIDE,
-        FLIP,
+        HORIZONTAL_FLIP,
+        VERTICAL_FLIP,
         ZOOM
     }
 
@@ -189,11 +191,13 @@
      * @author tvolkert
      */
     public class FlipTransition extends SelectionChangeTransition {
+        private Orientation orientation;
         private double theta;
         private ScaleDecorator scaleDecorator = new ScaleDecorator();
 
-        public FlipTransition(int from, int to) {
+        public FlipTransition(Orientation orientation, int from, int to) {
             super(from, to, 350);
+            this.orientation = orientation;
         }
 
         @Override
@@ -218,8 +222,13 @@
             if (percentComplete < 1f) {
                 theta = Math.PI * percentComplete;
 
-                float scaleY = (float)Math.abs(Math.cos(theta));
-                scaleDecorator.setScaleY(Math.max(scaleY, 0.01f));
+                float scale = (float)Math.abs(Math.cos(theta));
+
+                if (orientation == Orientation.HORIZONTAL) {
+                    scaleDecorator.setScale(Math.max(scale, 0.01f), 1.0f);
+                } else {
+                    scaleDecorator.setScale(1.0f, Math.max(scale, 0.01f));
+                }
 
                 fromCard.setVisible(theta < Math.PI / 2);
                 toCard.setVisible(theta >= Math.PI / 2);
@@ -544,10 +553,20 @@
                     break;
                 }
 
-                case FLIP: {
+                case HORIZONTAL_FLIP: {
+                    if (previousSelectedIndex != -1
+                        && selectedIndex != -1) {
+                        selectionChangeTransition = new FlipTransition(Orientation.HORIZONTAL,
+                            previousSelectedIndex, selectedIndex);
+                    }
+                    break;
+                }
+
+                case VERTICAL_FLIP: {
                     if (previousSelectedIndex != -1
                         && selectedIndex != -1) {
-                        selectionChangeTransition = new FlipTransition(previousSelectedIndex, selectedIndex);
+                        selectionChangeTransition = new FlipTransition(Orientation.VERTICAL,
+                            previousSelectedIndex, selectedIndex);
                     }
                     break;
                 }