From 3323ea2be07fa6cbdb6ea4412187ced51d09308c Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Wed, 3 Oct 2018 12:02:17 +0800 Subject: [PATCH] Remove JFXButton in AdvancedListItem --- .../ui/construct/AdvancedListItemSkin.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java index bba2d3a5c..73d9dd02f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListItemSkin.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.ui.construct; -import com.jfoenix.controls.JFXButton; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Label; @@ -83,19 +82,15 @@ public class AdvancedListItemSkin extends SkinBase { HBox right = new HBox(); right.setAlignment(Pos.CENTER); - right.setPickOnBounds(false); - - JFXButton settings = new JFXButton(); - FXUtils.setLimitWidth(settings, 40); - settings.getStyleClass().setAll("toggle-icon4"); - settings.graphicProperty().bind(skinnable.rightGraphicProperty()); - right.getChildren().setAll(settings); + right.setMouseTransparent(true); + right.getStyleClass().setAll("toggle-icon4"); + FXUtils.setLimitWidth(right, 40); + FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(), + newGraphic -> right.getChildren().setAll(newGraphic)); root.setRight(right); - FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(), newValue -> { - if (newValue) root.setRight(right); - else root.setRight(null); - }); + FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(), + visible -> root.setRight(visible ? right : null)); stackPane.setStyle("-fx-padding: 10 16 10 16;"); stackPane.getStyleClass().setAll("transparent");