Skip to content

Revert "修复 TransitionPane 动画被打断时节点状态异常的问题" #4986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Glavo merged 1 commit into from
Dec 18, 2025
+7 −17
Merged

Revert "修复 TransitionPane 动画被打断时节点状态异常的问题" #4986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
public class TransitionPane extends StackPane {

private Node currentNode;
private Animation oldAnimation;

public TransitionPane() {
FXUtils.setOverflowHidden(this);
Expand All @@ -51,11 +50,6 @@ public final void setContent(Node newView, AnimationProducer transition, Duratio

public void setContent(Node newView, AnimationProducer transition,
Duration duration, Interpolator interpolator) {
if (oldAnimation != null) {
oldAnimation.stop();
oldAnimation = null;
}

Node previousNode = currentNode != newView && getWidth() > 0 && getHeight() > 0 ? currentNode : null;
currentNode = newView;

Expand Down Expand Up @@ -86,19 +80,15 @@ public void setContent(Node newView, AnimationProducer transition,
previousNode,
newView,
duration, interpolator);
newAnimation.statusProperty().addListener((observable, oldValue, newValue) -> {
if (oldValue == Animation.Status.RUNNING && newValue != Animation.Status.RUNNING) {
setMouseTransparent(false);
getChildren().remove(previousNode);

if (cacheHint != null) {
newView.setCache(false);
}
newAnimation.setOnFinished(e -> {
setMouseTransparent(false);
getChildren().remove(previousNode);

if (cacheHint != null) {
newView.setCache(false);
}
});

oldAnimation = newAnimation;
newAnimation.play();
FXUtils.playAnimation(this, "transition_pane", newAnimation);
});

}
Expand Down