feat: animate the context menu when showing

teletha · Dec 19, 2023 · b37b200 · b37b200
1 parent b767c59
commit b37b200
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 31 deletions.
diff --git a/src/main/java/viewtify/ui/UIContextMenu.java b/src/main/java/viewtify/ui/UIContextMenu.java
@@ -100,6 +100,9 @@ public UIMenuItem menu(Variable text) {
     public void menu(Object text, Consumer<UIContextMenu> sub) {
         Menu menu = assignID(new Menu(String.valueOf(text)));
         menu.getProperties().put(id, null);
+        menu.setOnShowing(e -> {
+            System.out.println("SHOW " + e);
+        });
         menuProvider.get().add(menu);
 
         sub.accept(new UIContextMenu(text, menu::getItems));

diff --git a/src/main/java/viewtify/ui/anime/Anime.java b/src/main/java/viewtify/ui/anime/Anime.java
@@ -37,6 +37,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
+
 import kiss.Disposable;
 import kiss.WiseRunnable;
 import viewtify.Viewtify;
@@ -251,6 +252,17 @@ public final Anime move(UserInterfaceProvider<? extends Node> node, double x, do
         return moveX(node, x).moveY(node, y);
     }
 
+    /**
+     * Animate location.
+     * 
+     * @param node
+     * @param x
+     * @return
+     */
+    public final Anime moveX(Node node, double x) {
+        return effect(node.translateYProperty(), x);
+    }
+
     /**
      * Animate location.
      * 
@@ -259,7 +271,18 @@ public final Anime move(UserInterfaceProvider<? extends Node> node, double x, do
      * @return
      */
     public final Anime moveX(UserInterfaceProvider<? extends Node> node, double x) {
-        return effect(node.ui().translateXProperty(), x);
+        return moveX(node.ui(), x);
+    }
+
+    /**
+     * Animate location.
+     * 
+     * @param node
+     * @param y
+     * @return
+     */
+    public final Anime moveY(Node node, double y) {
+        return effect(node.translateYProperty(), y);
     }
 
     /**
@@ -270,7 +293,7 @@ public final Anime moveX(UserInterfaceProvider<? extends Node> node, double x) {
      * @return
      */
     public final Anime moveY(UserInterfaceProvider<? extends Node> node, double y) {
-        return effect(node.ui().translateYProperty(), y);
+        return moveY(node.ui(), y);
     }
 
     /**

diff --git a/src/main/java/viewtify/ui/helper/ContextMenuHelper.java b/src/main/java/viewtify/ui/helper/ContextMenuHelper.java
@@ -22,6 +22,11 @@
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.input.ContextMenuEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+
+import kiss.Variable;
 import viewtify.ui.UIContextMenu;
 import viewtify.ui.UserInterfaceProvider;
 
@@ -177,7 +182,6 @@ private Self showContextOn(Node anchor, Side location, double dx, double dy) {
         EnhancedContextMenu context = context();
         if (context.canShow()) {
             context.show(anchor, location, dx, dy);
-            context.assign(anchor);
         }
         return (Self) this;
     }
@@ -233,38 +237,49 @@ default boolean isContextShowing() {
     }
 
     /**
-     * Change the control of showing and hiding the context menu from right-click to left-click.
+     * Change the control of showing and hiding the context menu from right-click to left-click and
+     * ignore native context requesting.
      * 
      * @return
      */
     default Self behaveLikeButton() {
-        if (this instanceof UserActionHelper action) {
-            behaveLikeButton(action);
-        } else if (this instanceof EventTarget target) {
-            behaveLikeButton(UserActionHelper.of(target));
-        } else if (this instanceof UserInterfaceProvider provider && provider.ui() instanceof EventTarget target) {
-            behaveLikeButton(UserActionHelper.of(target));
-        }
+        target(this).to(x -> x.addEventHandler(MouseEvent.MOUSE_PRESSED, e -> {
+            if (e.getButton() == MouseButton.PRIMARY) {
+                toggleContext();
+            }
+        }));
+        return disableNativeContextRequest();
+    }
+
+    /**
+     * Enable the context menu.
+     * 
+     * @return
+     */
+    default Self enableContext() {
+        context().disable = false;
+
         return (Self) this;
     }
 
     /**
-     * Change the control of showing and hiding the context menu from right-click to left-click.
+     * Enable the context menu.
      * 
-     * @param action
+     * @return
      */
-    private void behaveLikeButton(UserActionHelper<?> action) {
-        // action.when(User.ContextMenu.preliminarily(), ContextMenuEvent::consume);
-        action.when(User.LeftPress, ContextMenuHelper.this::toggleContext);
+    default Self disableContext() {
+        context().disable = true;
+
+        return (Self) this;
     }
 
     /**
      * Enable the context menu.
      * 
      * @return
      */
-    default Self enableContext() {
-        context().disable = false;
+    default Self enableNativeContextRequest() {
+        target(this).to(x -> x.removeEventFilter(ContextMenuEvent.CONTEXT_MENU_REQUESTED, EnhancedContextMenu.NOOP));
 
         return (Self) this;
     }
@@ -274,9 +289,24 @@ default Self enableContext() {
      * 
      * @return
      */
-    default Self disableContext() {
-        context().disable = true;
+    default Self disableNativeContextRequest() {
+        target(this).to(x -> x.addEventFilter(ContextMenuEvent.CONTEXT_MENU_REQUESTED, EnhancedContextMenu.NOOP));
 
         return (Self) this;
     }
+
+    /**
+     * Wrap by {@link UserActionHelper}.
+     * 
+     * @param o
+     * @return
+     */
+    private Variable<EventTarget> target(Object o) {
+        if (o instanceof EventTarget target) {
+            return Variable.of(target);
+        } else if (o instanceof UserInterfaceProvider provider && provider.ui() instanceof EventTarget target) {
+            return Variable.of(target);
+        }
+        return Variable.empty();
+    }
 }
diff --git a/src/main/java/viewtify/ui/helper/EnhancedContextMenu.java b/src/main/java/viewtify/ui/helper/EnhancedContextMenu.java
@@ -17,18 +17,25 @@
 import javafx.scene.input.MouseEvent;
 import javafx.stage.WindowEvent;
 
-final class EnhancedContextMenu extends ContextMenu implements EventHandler<ContextMenuEvent> {
+import viewtify.ui.anime.Anime;
+
+final class EnhancedContextMenu extends ContextMenu {
+
+    /** The reusable event consumer. */
+    static final EventHandler<ContextMenuEvent> NOOP = ContextMenuEvent::consume;
 
     /** The disable state. */
     boolean disable;
 
+    /** The last hidden time. */
     long lastHidden;
 
     /**
      * 
      */
     EnhancedContextMenu() {
         addEventHandler(WindowEvent.WINDOW_HIDDEN, e -> lastHidden = System.currentTimeMillis());
+
         addEventHandler(WindowEvent.WINDOW_SHOWING, new EventHandler<>() {
 
             @Override
@@ -81,15 +88,13 @@ boolean canShow() {
      * {@inheritDoc}
      */
     @Override
-    public void handle(ContextMenuEvent event) {
-        System.out.println("STOP");
-        event.consume();
-    }
+    protected void show() {
+        super.show();
 
-    /**
-     * @param anchor
-     */
-    void assign(Node anchor) {
-        anchor.addEventFilter(ContextMenuEvent.CONTEXT_MENU_REQUESTED, this);
+        Node node = getStyleableNode();
+        node.setTranslateY(-10);
+        node.setOpacity(0);
+
+        Anime.define().opacity(node, 1).moveY(node, 0).run();
     }
 }
diff --git a/src/main/java/viewtify/ui/helper/UserActionHelper.java b/src/main/java/viewtify/ui/helper/UserActionHelper.java
@@ -259,7 +259,7 @@ private <E extends Event> Self when(Signal<User<E>> actionTypes, WiseBiConsumer<
     }
 
     /**
-     * Create temporary {@link UserActionHelper}.
+     * Wrap by {@link UserActionHelper}.
      * 
      * @param eventTarget
      * @return