From 87904109ca7e2557ebe8c28c55dc9d6baeca924b Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Sat, 7 Jul 2018 17:26:20 +0800 Subject: [PATCH] [TransitionHandler]Set mouseTransparent of the whole view , fix bug introduced in 3fb5048f103ed958bdd87207f6b6c929b5ef7eca --- .../org/jackhuang/hmcl/ui/animation/TransitionHandler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java index cec4a9d47..b350bb9a2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java @@ -86,7 +86,7 @@ public final class TransitionHandler implements AnimationHandler { Timeline nowAnimation = new Timeline(); nowAnimation.getKeyFrames().addAll(transition.animate(this)); nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> { - previousNode.setMouseTransparent((Boolean) previousNode.getProperties().get(MOUSE_TRANSPARENT)); + view.setMouseTransparent(false); view.getChildren().remove(previousNode); })); nowAnimation.play(); @@ -105,14 +105,12 @@ public final class TransitionHandler implements AnimationHandler { if (previousNode == newView) previousNode = NULL; - previousNode.getProperties().put(MOUSE_TRANSPARENT, previousNode.isMouseTransparent()); - previousNode.setMouseTransparent(true); + view.setMouseTransparent(true); currentNode = newView; view.getChildren().setAll(previousNode, currentNode); } - private static final String MOUSE_TRANSPARENT = "TransitionHandler.MOUSE_TRANSPARENT"; private static final StackPane NULL = new StackPane(); }