lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #2680: Revert TwoLineListItem (#2681)

Browse Source
This commit is contained in:
Glavo
2024-01-25 21:11:21 +08:00
committed by GitHub
parent 1eb53b247c
commit 4cbf5ce979
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
View File

@@ -26,7 +26,6 @@ import javafx.geometry.Insets;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.util.AggregatedObservableList; import org.jackhuang.hmcl.util.AggregatedObservableList;
@@ -39,6 +38,9 @@ public class TwoLineListItem extends VBox {
private final ObservableList<String> tags = FXCollections.observableArrayList(); private final ObservableList<String> tags = FXCollections.observableArrayList();
private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle"); private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
private final ObservableList<Node> tagLabels;
private final AggregatedObservableList<Node> firstLineChildren;
public TwoLineListItem(String titleString, String subtitleString) { public TwoLineListItem(String titleString, String subtitleString) {
this(); this();
@@ -56,14 +58,14 @@ public class TwoLineListItem extends VBox {
lblTitle.getStyleClass().add("title"); lblTitle.getStyleClass().add("title");
lblTitle.textProperty().bind(title); lblTitle.textProperty().bind(title);
ObservableList<Node> tagLabels = MappedObservableList.create(tags, tag -> { tagLabels = MappedObservableList.create(tags, tag -> {
Label tagLabel = new Label(); Label tagLabel = new Label();
tagLabel.getStyleClass().add("tag"); tagLabel.getStyleClass().add("tag");
tagLabel.setText(tag); tagLabel.setText(tag);
HBox.setMargin(tagLabel, new Insets(0, 8, 0, 0)); HBox.setMargin(tagLabel, new Insets(0, 8, 0, 0));
return tagLabel; return tagLabel;
}); });
AggregatedObservableList<Node> firstLineChildren = new AggregatedObservableList<>(); firstLineChildren = new AggregatedObservableList<>();
firstLineChildren.appendList(FXCollections.singletonObservableList(lblTitle)); firstLineChildren.appendList(FXCollections.singletonObservableList(lblTitle));
firstLineChildren.appendList(tagLabels); firstLineChildren.appendList(tagLabels);
Bindings.bindContent(firstLine.getChildren(), firstLineChildren.getAggregatedList()); Bindings.bindContent(firstLine.getChildren(), firstLineChildren.getAggregatedList());
@@ -83,9 +85,6 @@ public class TwoLineListItem extends VBox {
}); });
getStyleClass().add(DEFAULT_STYLE_CLASS); getStyleClass().add(DEFAULT_STYLE_CLASS);
this.minWidthProperty().set(0);
HBox.setHgrow(this, Priority.SOMETIMES);
} }
public String getTitle() { public String getTitle() {