update

Author: Glavo

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ComponentListCell.java

@@ -19,16 +19,13 @@
 
 import javafx.animation.*;
 import javafx.application.Platform;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
-import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.theme.Themes;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -42,34 +39,14 @@
 final class ComponentListCell extends StackPane {
     private final Node content;
     private Animation expandAnimation;
-    private Rectangle clipRect;
-    private final BooleanProperty expanded = new SimpleBooleanProperty(this, "expanded", false);
+    private boolean expanded = false;
 
     ComponentListCell(Node content) {
         this.content = content;
 
         updateLayout();
     }
 
-    private void updateClip(double newHeight) {
-        if (clipRect != null)
-            clipRect.setHeight(newHeight);
-    }
-
-    @Override
-    protected void layoutChildren() {
-        super.layoutChildren();
-
-        if (clipRect == null)
-            clipRect = new Rectangle(0, 0, getWidth(), getHeight());
-        else {
-            clipRect.setX(0);
-            clipRect.setY(0);
-            clipRect.setHeight(getHeight());
-            clipRect.setWidth(getWidth());
-        }
-    }
-
     private void updateLayout() {
         if (content instanceof ComponentList list) {
             content.getStyleClass().remove("options-list");
@@ -147,8 +124,8 @@ private void updateLayout() {
                     expandAnimation.stop();
                 }
 
-                boolean expanded = !isExpanded();
-                setExpanded(expanded);
+                boolean expanded = !this.expanded;
+                this.expanded = expanded;
                 if (expanded) {
                     list.doLazyInit();
                     list.layout();
@@ -157,14 +134,10 @@ private void updateLayout() {
                 Platform.runLater(() -> {
                     // FIXME: ComponentSubList without padding must have a 4 pixel padding for displaying a border radius.
                     double newAnimatedHeight = (list.prefHeight(list.getWidth()) + (hasPadding ? 8 + 10 : 4)) * (expanded ? 1 : -1);
-                    double newHeight = expanded ? getHeight() + newAnimatedHeight : prefHeight(list.getWidth());
+                    // double newHeight = expanded ? getHeight() + newAnimatedHeight : prefHeight(list.getWidth());
                     double contentHeight = expanded ? newAnimatedHeight : 0;
                     double targetRotate = expanded ? -180 : 0;
 
-                    if (expanded) {
-                        updateClip(newHeight);
-                    }
-
                     if (AnimationUtils.isAnimationEnabled()) {
                         double currentRotate = expandIcon.getRotate();
                         Duration duration = Motion.LONG2.multiply(Math.abs(currentRotate - targetRotate) / 180.0);
@@ -177,19 +150,11 @@ private void updateLayout() {
                                         new KeyValue(expandIcon.rotateProperty(), targetRotate, interpolator))
                         );
 
-                        if (!expanded) {
-                            expandAnimation.setOnFinished(e2 -> updateClip(newHeight));
-                        }
-
                         expandAnimation.play();
                     } else {
                         container.setMinHeight(contentHeight);
                         container.setMaxHeight(contentHeight);
                         expandIcon.setRotate(targetRotate);
-
-                        if (!expanded) {
-                            updateClip(newHeight);
-                        }
                     }
                 });
             });
@@ -200,16 +165,4 @@ private void updateLayout() {
             getChildren().setAll(content);
         }
     }
-
-    public boolean isExpanded() {
-        return expanded.get();
-    }
-
-    public BooleanProperty expandedProperty() {
-        return expanded;
-    }
-
-    public void setExpanded(boolean expanded) {
-        this.expanded.set(expanded);
-    }
 }