diff options
3 files changed, 13 insertions, 61 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/PageChangeAnimation.java b/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/PageChangeAnimation.java index 5be81dc0e..937e6d0d8 100755 --- a/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/PageChangeAnimation.java +++ b/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/PageChangeAnimation.java @@ -25,56 +25,12 @@ import javafx.util.Duration; import org.eclipse.fx.ui.animation.pagetransition.CenterSwitchAnimation; +/** + * A page change animation + */ +@SuppressWarnings("deprecation") public class PageChangeAnimation extends CenterSwitchAnimation { -// @Override -// public void animate(final BorderPane pane, final Node newNode) { -// pane.setDepthTest(DepthTest.DISABLE); -// final Node curNode = pane.getCenter(); -// -// pane.setCenter(null); -// -// final Group area = new Group(); -// area.setDepthTest(DepthTest.ENABLE); -// -// Bounds b = curNode.getBoundsInParent(); -// newNode.resizeRelocate(b.getMinX(), b.getMinY(), b.getWidth(), b.getHeight()); -// area.getChildren().add(newNode); -// area.getChildren().add(curNode); -// -// newNode.setTranslateZ(0.1); -// curNode.setTranslateZ(-0.1); -// newNode.setRotationAxis(Rotate.Y_AXIS); -// newNode.setRotate(180); -// -// -// -// pane.setCenter(area); -// -// if (imageView != null) { -// pane.getChildren().add(0,imageView); -// } -// -// Animation animation = createAndPrepareAnimation(area, null); -// -// animation.onFinishedProperty().set(new EventHandler<ActionEvent>() { -// -// @Override -// public void handle(ActionEvent event) { -// pane.getChildren().remove(curNode); -// pane.getChildren().remove(newNode); -// pane.setCenter(newNode); -// resetProperties(curNode, newNode); -// -// if (imageView != null) { -// pane.getChildren().remove(imageView); -// } -// } -// }); -// -// animation.play(); -// } - @Override protected Animation createAndPrepareAnimation(Node curNode, Node newNode) { Bounds b = curNode.getBoundsInLocal(); @@ -85,10 +41,7 @@ public class PageChangeAnimation extends CenterSwitchAnimation { CubicCurve cIn = new CubicCurve(cX - val, cY, cX - val, cY - val, cX, cY - val, cX, cY); CubicCurve cOut = new CubicCurve(cX, cY, cX, cY + val, cX + val, cY + val, cX + val, cY + 0); -// cIn.setRotationAxis(Rotate.X_AXIS); -// cIn.setRotate(70); -// cOut.setRotationAxis(Rotate.X_AXIS); -// cOut.setRotate(70); + PathTransitionBuilder moveOut = PathTransitionBuilder.create() .duration(new Duration(1000)) .node(curNode) @@ -162,12 +115,6 @@ public class PageChangeAnimation extends CenterSwitchAnimation { ).build() ) .build(); -// return RotateTransitionBuilder.create() -// .axis(Rotate.Y_AXIS) -// .node(area) -// .byAngle(180) -// .duration(new Duration(4000)) -// .interpolator(Interpolator.EASE_BOTH).build(); } @Override diff --git a/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/SlideAnimation.java b/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/SlideAnimation.java index bfe109830..0b65c7cb8 100755 --- a/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/SlideAnimation.java +++ b/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/SlideAnimation.java @@ -20,6 +20,10 @@ import javafx.animation.TranslateTransitionBuilder; import javafx.scene.Node;
import javafx.util.Duration;
+/**
+ * Slide transition
+ */
+@SuppressWarnings("deprecation")
public class SlideAnimation extends CenterSwitchAnimation {
@Override
diff --git a/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/ZoomSlideAnimation.java b/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/ZoomSlideAnimation.java index 31cbf37a9..a15e10f6a 100755 --- a/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/ZoomSlideAnimation.java +++ b/bundles/runtime/org.eclipse.fx.ui.animation/src/org/eclipse/fx/ui/animation/pagetransition/animation/ZoomSlideAnimation.java @@ -22,6 +22,10 @@ import javafx.util.Duration; import org.eclipse.fx.ui.animation.pagetransition.CenterSwitchAnimation;
+/**
+ * Zoom and slide animations
+ */
+@SuppressWarnings("deprecation")
public class ZoomSlideAnimation extends CenterSwitchAnimation {
@Override
@@ -30,9 +34,6 @@ public class ZoomSlideAnimation extends CenterSwitchAnimation { newNode.setTranslateX(-deltaX);
-// curNode.setEffect(new DropShadow(2, 2, 2, Color.RED));
-// newNode.setEffect(new DropShadow(2, 2, 2, Color.RED));
-
TranslateTransitionBuilder slide = TranslateTransitionBuilder.create()
.interpolator(Interpolator.EASE_BOTH)
.byX(deltaX)
|