diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java index c7a99881db..6cbaeb591d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java @@ -40,6 +40,7 @@ public enum SVG { ARROW_FORWARD("M16.175 13H4V11H16.175L10.575 5.4 12 4 20 12 12 20 10.575 18.6 16.175 13Z"), BETA_CIRCLE("M15,10.5C15,11.3 14.3,12 13.5,12C14.3,12 15,12.7 15,13.5V15A2,2 0 0,1 13,17H9V7H13A2,2 0 0,1 15,9V10.5M13,15V13H11V15H13M13,11V9H11V11H13M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z"), // Not Material CANCEL("M8.4 17 12 13.4 15.6 17 17 15.6 13.4 12 17 8.4 15.6 7 12 10.6 8.4 7 7 8.4 10.6 12 7 15.6 8.4 17ZM12 22Q9.925 22 8.1 21.2125T4.925 19.075Q3.575 17.725 2.7875 15.9T2 12Q2 9.925 2.7875 8.1T4.925 4.925Q6.275 3.575 8.1 2.7875T12 2Q14.075 2 15.9 2.7875T19.075 4.925Q20.425 6.275 21.2125 8.1T22 12Q22 14.075 21.2125 15.9T19.075 19.075Q17.725 20.425 15.9 21.2125T12 22ZM12 20Q15.35 20 17.675 17.675T20 12Q20 8.65 17.675 6.325T12 4Q8.65 4 6.325 6.325T4 12Q4 15.35 6.325 17.675T12 20ZM12 12Z"), + CATEGORY("M6.5 11L12 2l5.5 9zm11 11q-1.875 0-3.187-1.312T13 17.5t1.313-3.187T17.5 13t3.188 1.313T22 17.5t-1.312 3.188T17.5 22M3 21.5v-8h8v8zM17.5 20q1.05 0 1.775-.725T20 17.5t-.725-1.775T17.5 15t-1.775.725T15 17.5t.725 1.775T17.5 20M5 19.5h4v-4H5zM10.05 9h3.9L12 5.85zm7.45 8.5"), CHAT("M6 14H14V12H6V14ZM6 11H18V9H6V11ZM6 8H18V6H6V8ZM2 22V4Q2 3.175 2.5875 2.5875T4 2H20Q20.825 2 21.4125 2.5875T22 4V16Q22 16.825 21.4125 17.4125T20 18H6L2 22ZM5.15 16H20V4H4V17.125L5.15 16ZM4 16V4 16Z"), CHECK("M9.55 18 3.85 12.3 5.275 10.875 9.55 15.15 18.725 5.975 20.15 7.4 9.55 18Z"), CHECKROOM("M3 20Q2.575 20 2.2875 19.7125T2 19Q2 18.75 2.1 18.5375T2.4 18.2L11 11.75V10Q11 9.575 11.3 9.2875T12.025 9Q12.65 9 13.075 8.55T13.5 7.475Q13.5 6.85 13.0625 6.425T12 6Q11.375 6 10.9375 6.4375T10.5 7.5H8.5Q8.5 6.05 9.525 5.025T12 4Q13.45 4 14.475 5.0125T15.5 7.475Q15.5 8.65 14.8125 9.575T13 10.85V11.75L21.6 18.2Q21.8 18.325 21.9 18.5375T22 19Q22 19.425 21.7125 19.7125T21 20H3ZM6 18H18L12 13.5 6 18Z"), diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java index 4bbf5f1d5b..72e2853739 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java @@ -17,40 +17,30 @@ */ package org.jackhuang.hmcl.ui.construct; -import com.jfoenix.controls.JFXPopup; import javafx.beans.InvalidationListener; -import javafx.beans.binding.Bindings; -import javafx.beans.property.*; -import javafx.collections.FXCollections; +import javafx.beans.property.ListProperty; +import javafx.beans.property.ObjectProperty; import javafx.collections.ObservableList; -import javafx.css.PseudoClass; -import javafx.geometry.Pos; -import javafx.scene.control.Label; import javafx.scene.input.MouseButton; import javafx.scene.input.MouseEvent; import javafx.scene.input.ScrollEvent; -import javafx.scene.layout.*; -import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; -import org.jackhuang.hmcl.util.javafx.MappedObservableList; import java.util.Collection; -import java.util.Objects; import java.util.function.Function; -import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition; - /// @author Glavo public final class LineSelectButton extends LineButton { private static final String DEFAULT_STYLE_CLASS = "line-select-button"; - private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected"); - private JFXPopup popup; + private final SelectPopup selectPopup; public LineSelectButton() { this.getStyleClass().add(DEFAULT_STYLE_CLASS); + this.selectPopup = new SelectPopup<>(); + InvalidationListener updateTrailingText = observable -> { T value = getValue(); if (value != null) { @@ -67,150 +57,83 @@ public LineSelectButton() { ripplerContainer.addEventHandler(MouseEvent.MOUSE_CLICKED, event -> { if (event.getButton() == MouseButton.SECONDARY) { - if (popup != null) - popup.hide(); + if (selectPopup.isShowing()) { + selectPopup.hide(); + } event.consume(); } }); + + ripplerContainer.addEventFilter(ScrollEvent.ANY, ignored -> selectPopup.hide()); + + selectPopup.showingProperty().addListener((observable, oldValue, newValue) -> + ripplerContainer.getRippler().setRipplerDisabled(newValue)); } @Override public void fire() { super.fire(); - if (popup == null) { - PopupMenu popupMenu = new PopupMenu(); - this.popup = new JFXPopup(popupMenu); - - ripplerContainer.addEventFilter(ScrollEvent.ANY, ignored -> popup.hide()); - - Bindings.bindContent(popupMenu.getContent(), MappedObservableList.create(itemsProperty(), item -> { - VBox vbox = new VBox(); - - var itemTitleLabel = new Label(); - itemTitleLabel.getStyleClass().add("title-label"); - itemTitleLabel.textProperty().bind(Bindings.createStringBinding(() -> { - if (item == null) - return ""; - - Function converter = getConverter(); - return converter != null ? converter.apply(item) : Objects.toString(item, ""); - }, converterProperty())); - - var itemSubtitleLabel = new Label(); - itemSubtitleLabel.getStyleClass().add("subtitle-label"); - itemSubtitleLabel.textProperty().bind(Bindings.createStringBinding(() -> { - Function descriptionConverter = getDescriptionConverter(); - return descriptionConverter != null ? descriptionConverter.apply(item) : ""; - }, descriptionConverterProperty())); - - FXUtils.onChangeAndOperate(itemSubtitleLabel.textProperty(), text -> { - if (text == null || text.isEmpty()) { - vbox.getChildren().setAll(itemTitleLabel); - } else { - vbox.getChildren().setAll(itemTitleLabel, itemSubtitleLabel); - } - }); - - var wrapper = new StackPane(vbox); - wrapper.setAlignment(Pos.CENTER_LEFT); - wrapper.getStyleClass().add("menu-container"); - wrapper.setMouseTransparent(true); - RipplerContainer ripplerContainer = new RipplerContainer(wrapper); - FXUtils.onClicked(ripplerContainer, () -> { - setValue(item); - popup.hide(); - }); - - FXUtils.onChangeAndOperate(valueProperty(), - value -> wrapper.pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, Objects.equals(value, item))); - - return ripplerContainer; - })); - - popup.showingProperty().addListener((observable, oldValue, newValue) -> - ripplerContainer.getRippler().setRipplerDisabled(newValue)); - } - - if (popup.isShowing()) { - popup.hide(); + if (selectPopup.isShowing()) { + selectPopup.hide(); } else { - JFXPopup.PopupVPosition vPosition = determineOptimalPopupPosition(this, popup); - popup.show(this, vPosition, JFXPopup.PopupHPosition.RIGHT, - 0, - vPosition == JFXPopup.PopupVPosition.TOP ? this.getHeight() : -this.getHeight(), - true); + selectPopup.showRelativeTo(this); } } - private final ObjectProperty value = new SimpleObjectProperty<>(this, "value"); - public ObjectProperty valueProperty() { - return value; + return selectPopup.valueProperty(); } public T getValue() { - return valueProperty().get(); + return selectPopup.getValue(); } public void setValue(T value) { - valueProperty().set(value); + selectPopup.setValue(value); } - private final ObjectProperty> converter = new SimpleObjectProperty<>(this, "converter"); - public ObjectProperty> converterProperty() { - return converter; + return selectPopup.converterProperty(); } public Function getConverter() { - return converterProperty().get(); + return selectPopup.getConverter(); } public void setConverter(Function value) { - converterProperty().set(value); + selectPopup.setConverter(value); } - private ObjectProperty> descriptionConverter; - public ObjectProperty> descriptionConverterProperty() { - if (descriptionConverter == null) - descriptionConverter = new SimpleObjectProperty<>(this, "descriptionConverter"); - return descriptionConverter; + return selectPopup.descriptionConverterProperty(); } public Function getDescriptionConverter() { - return descriptionConverterProperty().get(); + return selectPopup.getDescriptionConverter(); } public void setDescriptionConverter(Function value) { - descriptionConverterProperty().set(value); + selectPopup.setDescriptionConverter(value); } - private final ListProperty items = new SimpleListProperty<>(this, "items", FXCollections.emptyObservableList()); - public ListProperty itemsProperty() { - return items; + return selectPopup.itemsProperty(); + } + + public ObservableList getItems() { + return selectPopup.getItems(); } public void setItems(ObservableList value) { - itemsProperty().set(value); + selectPopup.setItems(value); } public void setItems(Collection value) { - if (value instanceof ObservableList observableList) { - this.setItems(observableList); - } else { - this.setItems(FXCollections.observableArrayList(value)); - } + selectPopup.setItems(value); } @SafeVarargs public final void setItems(T... values) { - this.setItems(FXCollections.observableArrayList(values)); + selectPopup.setItems(values); } - - public ObservableList getItems() { - return items.get(); - } - } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/SelectPopup.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/SelectPopup.java new file mode 100644 index 0000000000..77c987df2f --- /dev/null +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/SelectPopup.java @@ -0,0 +1,205 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2026 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl.ui.construct; + +import com.jfoenix.controls.JFXPopup; +import javafx.beans.binding.Bindings; +import javafx.beans.property.*; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.css.PseudoClass; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.layout.Region; +import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; +import org.jackhuang.hmcl.ui.FXUtils; +import org.jackhuang.hmcl.util.javafx.MappedObservableList; + +import java.util.Collection; +import java.util.Objects; +import java.util.function.Function; + +public class SelectPopup extends ScrollPane { + + private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected"); + + private final ObjectProperty value = new SimpleObjectProperty<>(this, "value"); + private final ObjectProperty> converter = new SimpleObjectProperty<>(this, "converter"); + private final ObjectProperty> descriptionConverter = new SimpleObjectProperty<>(this, "descriptionConverter"); + private final ListProperty items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList()); + + private Runnable onSelectedAction; + private JFXPopup popup; + + public SelectPopup() { + this.getStyleClass().add("select-popup"); + this.setMaxHeight(365); + this.setFitToWidth(true); + this.setHbarPolicy(ScrollBarPolicy.NEVER); + this.setVbarPolicy(ScrollBarPolicy.NEVER); + + VBox contentBox = new VBox(); + this.setContent(contentBox); + + Bindings.bindContent(contentBox.getChildren(), MappedObservableList.create(itemsProperty(), item -> { + VBox vbox = new VBox(); + + var itemTitleLabel = new Label(); + itemTitleLabel.getStyleClass().add("title-label"); + itemTitleLabel.textProperty().bind(Bindings.createStringBinding(() -> { + if (item == null) return ""; + + Function converter = getConverter(); + return converter != null ? converter.apply(item) : Objects.toString(item, ""); + }, converterProperty())); + + var itemSubtitleLabel = new Label(); + itemSubtitleLabel.getStyleClass().add("subtitle-label"); + itemSubtitleLabel.textProperty().bind(Bindings.createStringBinding(() -> { + Function descriptionConverter = getDescriptionConverter(); + return descriptionConverter != null ? descriptionConverter.apply(item) : ""; + }, descriptionConverterProperty())); + + FXUtils.onChangeAndOperate(itemSubtitleLabel.textProperty(), text -> { + if (text == null || text.isEmpty()) { + vbox.getChildren().setAll(itemTitleLabel); + } else { + vbox.getChildren().setAll(itemTitleLabel, itemSubtitleLabel); + } + }); + + var wrapper = new StackPane(vbox); + wrapper.setAlignment(Pos.CENTER_LEFT); + wrapper.getStyleClass().add("menu-container"); + wrapper.setMouseTransparent(true); + RipplerContainer ripplerContainer = new RipplerContainer(wrapper); + + FXUtils.onClicked(ripplerContainer, () -> { + setValue(item); + if (onSelectedAction != null) { + onSelectedAction.run(); + } + hide(); + }); + + FXUtils.onChangeAndOperate(valueProperty(), value -> wrapper.pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, Objects.equals(value, item))); + + return ripplerContainer; + })); + } + + private void ensurePopup() { + if (popup == null) { + popup = new JFXPopup(this); + } + } + + public void showRelativeTo(Region owner) { + ensurePopup(); + JFXPopup.PopupVPosition vPosition = FXUtils.determineOptimalPopupPosition(owner, popup); + popup.show(owner, vPosition, JFXPopup.PopupHPosition.RIGHT, 0, vPosition == JFXPopup.PopupVPosition.TOP ? owner.getHeight() : -owner.getHeight(), true); + } + + public void show(Node owner, JFXPopup.PopupVPosition vAlign, JFXPopup.PopupHPosition hAlign, double initOffsetX, double initOffsetY) { + ensurePopup(); + popup.show(owner, vAlign, hAlign, initOffsetX, initOffsetY); + } + + public void hide() { + if (popup != null && popup.isShowing()) { + popup.hide(); + } + } + + public boolean isShowing() { + return popup != null && popup.isShowing(); + } + + public ReadOnlyBooleanProperty showingProperty() { + ensurePopup(); + return popup.showingProperty(); + } + + public void setOnSelectedAction(Runnable action) { + this.onSelectedAction = action; + } + + public ObjectProperty valueProperty() { + return value; + } + + public T getValue() { + return value.get(); + } + + public void setValue(T value) { + this.value.set(value); + } + + public ObjectProperty> converterProperty() { + return converter; + } + + public Function getConverter() { + return converter.get(); + } + + public void setConverter(Function value) { + this.converter.set(value); + } + + public ObjectProperty> descriptionConverterProperty() { + return descriptionConverter; + } + + public Function getDescriptionConverter() { + return descriptionConverter.get(); + } + + public void setDescriptionConverter(Function value) { + this.descriptionConverter.set(value); + } + + public ListProperty itemsProperty() { + return items; + } + + public ObservableList getItems() { + return items.get(); + } + + public void setItems(ObservableList value) { + itemsProperty().set(value); + } + + public void setItems(Collection value) { + if (value instanceof ObservableList observableList) { + this.setItems(observableList); + } else { + this.setItems(FXCollections.observableArrayList(value)); + } + } + + @SafeVarargs + public final void setItems(T... values) { + this.setItems(FXCollections.observableArrayList(values)); + } +} diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java index a602b2f75e..7f1b5367a1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java @@ -17,7 +17,11 @@ */ package org.jackhuang.hmcl.ui.download; -import com.jfoenix.controls.*; +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXListView; +import com.jfoenix.controls.JFXSpinner; +import com.jfoenix.controls.JFXTextField; +import javafx.animation.PauseTransition; import javafx.beans.InvalidationListener; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; @@ -25,11 +29,16 @@ import javafx.collections.ObservableList; import javafx.geometry.Insets; import javafx.geometry.Pos; +import javafx.scene.Node; import javafx.scene.control.*; import javafx.scene.image.ImageView; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; -import javafx.scene.layout.*; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.StackPane; +import javafx.util.Duration; import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.VersionList; @@ -54,7 +63,7 @@ import org.jackhuang.hmcl.ui.animation.TransitionPane; import org.jackhuang.hmcl.ui.construct.ComponentList; import org.jackhuang.hmcl.ui.construct.RipplerContainer; -import org.jackhuang.hmcl.ui.construct.SpinnerPane; +import org.jackhuang.hmcl.ui.construct.SelectPopup; import org.jackhuang.hmcl.ui.construct.TwoLineListItem; import org.jackhuang.hmcl.ui.wizard.Navigation; import org.jackhuang.hmcl.ui.wizard.Refreshable; @@ -63,7 +72,6 @@ import org.jackhuang.hmcl.util.StringUtils; import org.jackhuang.hmcl.util.i18n.I18n; import org.jackhuang.hmcl.util.platform.OperatingSystem; -import org.jackhuang.hmcl.util.platform.Platform; import org.jackhuang.hmcl.util.versioning.GameVersionNumber; import java.util.Locale; @@ -72,6 +80,7 @@ import java.util.stream.Stream; import static org.jackhuang.hmcl.ui.FXUtils.*; +import static org.jackhuang.hmcl.ui.ToolbarListPageSkin.createToolbarButton2; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.logging.Logger.LOG; @@ -80,7 +89,6 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab private final String libraryId; private final String title; private final Navigation navigation; - private final DownloadProvider downloadProvider; private final VersionList versionList; private final Runnable callback; @@ -96,7 +104,6 @@ public VersionsPage(Navigation navigation, this.gameVersion = gameVersion; this.libraryId = libraryId; this.navigation = navigation; - this.downloadProvider = downloadProvider; this.versionList = downloadProvider.getVersionListById(libraryId); this.callback = callback; @@ -203,10 +210,10 @@ private void onAction() { private void onOpenWiki() { RemoteVersion item = getItem(); - if (!(item instanceof GameRemoteVersion)) + if (!(item instanceof GameRemoteVersion remoteVersion)) return; - FXUtils.openLink(I18n.getWikiLink((GameRemoteVersion) item)); + FXUtils.openLink(I18n.getWikiLink(remoteVersion)); } @Override @@ -252,7 +259,7 @@ public void updateItem(RemoteVersion remoteVersion, boolean empty) { } } - switch (NativePatcher.checkSupportedStatus(gameVersion, Platform.SYSTEM_PLATFORM, OperatingSystem.SYSTEM_VERSION)) { + switch (NativePatcher.checkSupportedStatus(gameVersion, org.jackhuang.hmcl.util.platform.Platform.SYSTEM_PLATFORM, OperatingSystem.SYSTEM_VERSION)) { case UNTESTED -> twoLineListItem.addTagWarning(i18n("version.game.support_status.untested")); case UNSUPPORTED -> twoLineListItem.addTagWarning(i18n("version.game.support_status.unsupported")); } @@ -294,112 +301,120 @@ private static final class VersionsPageSkin extends SkinBase { private final TransitionPane transitionPane; private final JFXSpinner spinner; - private final JFXTextField nameField; - private final JFXComboBox categoryField = new JFXComboBox<>(); + private final TransitionPane toolbarPane; + private final HBox searchBar; + private final HBox toolbarNormal; + + private final JFXTextField searchField; + private final SelectPopup categorySelect = new SelectPopup<>(); VersionsPageSkin(VersionsPage control) { super(control); - BorderPane root = new BorderPane(); + StackPane pane = new StackPane(); + pane.setPadding(new Insets(10)); + + ComponentList root = new ComponentList(); + root.getStyleClass().add("no-padding"); - GridPane searchPane = new GridPane(); - root.setTop(searchPane); - searchPane.getStyleClass().addAll("card"); - BorderPane.setMargin(searchPane, new Insets(10, 10, 0, 10)); + BorderPane borderPane = new BorderPane(); + JFXButton selectButton = createToolbarButton2("", SVG.CATEGORY, null); - ColumnConstraints nameColumn = new ColumnConstraints(); - nameColumn.setMinWidth(USE_PREF_SIZE); - ColumnConstraints column1 = new ColumnConstraints(); - column1.setHgrow(Priority.ALWAYS); - ColumnConstraints column2 = new ColumnConstraints(); - column2.setMaxWidth(150); - ColumnConstraints column3 = new ColumnConstraints(); + selectButton.setOnAction((event) -> { + if (categorySelect.isShowing()) { + categorySelect.hide(); + } else { + categorySelect.showRelativeTo(selectButton); + } + }); - if (control.versionList.hasType()) - searchPane.getColumnConstraints().setAll(nameColumn, column1, nameColumn, column2, column3); - else - searchPane.getColumnConstraints().setAll(nameColumn, column1, column3); + InvalidationListener listener = (observable) -> selectButton.setText(i18n("version.game." + categorySelect.getValue().toString().toLowerCase(Locale.ROOT))); - searchPane.setHgap(16); - searchPane.setVgap(10); + categorySelect.valueProperty().addListener(listener); + borderPane.setRight(selectButton); + BorderPane.setAlignment(categorySelect, Pos.CENTER_RIGHT); { - int rowIndex = 0; + toolbarPane = new TransitionPane(); + + searchBar = new HBox(); + toolbarNormal = new HBox(); + + searchBar.setAlignment(Pos.CENTER); + searchBar.setPadding(new Insets(0, 5, 0, 5)); + searchField = new JFXTextField(); + searchField.setPromptText(i18n("version.search.prompt")); + HBox.setHgrow(searchField, Priority.ALWAYS); + + PauseTransition pause = new PauseTransition(Duration.millis(100)); + pause.setOnFinished(e -> updateList()); + searchField.textProperty().addListener((observable, oldValue, newValue) -> { + pause.setRate(1); + pause.playFromStart(); + }); - { - nameField = new JFXTextField(); - nameField.setPromptText(i18n("version.search.prompt")); - nameField.textProperty().addListener(o -> updateList()); + JFXButton closeSearchBar = createToolbarButton2(null, SVG.CLOSE, () -> { + changeToolbar(toolbarNormal); + searchField.clear(); + }); + + onEscPressed(searchField, closeSearchBar::fire); + searchBar.getChildren().setAll(searchField, closeSearchBar); + + JFXButton refreshButton = createToolbarButton2(i18n("button.refresh"), SVG.REFRESH, control::onRefresh); + JFXButton searchButton = createToolbarButton2(i18n("search"), SVG.SEARCH, () -> changeToolbar(searchBar)); + + toolbarNormal.setAlignment(Pos.CENTER_LEFT); + + categorySelect.setItems(FXCollections.observableArrayList()); + if (control.versionList.hasType()) { if ("game".equals(control.libraryId)) { - categoryField.getItems().setAll( + categorySelect.getItems().setAll( VersionTypeFilter.ALL, VersionTypeFilter.RELEASE, VersionTypeFilter.SNAPSHOTS, VersionTypeFilter.APRIL_FOOLS, VersionTypeFilter.OLD ); - categoryField.getSelectionModel().select(VersionTypeFilter.RELEASE); + categorySelect.setValue(VersionTypeFilter.RELEASE); } else { - categoryField.getItems().setAll( + categorySelect.getItems().setAll( VersionTypeFilter.ALL, VersionTypeFilter.RELEASE, VersionTypeFilter.SNAPSHOTS ); - categoryField.getSelectionModel().select(VersionTypeFilter.ALL); + categorySelect.setValue(VersionTypeFilter.ALL); } - categoryField.setConverter(stringConverter(type -> i18n("version.game." + type.name().toLowerCase(Locale.ROOT)))); - categoryField.getSelectionModel().selectedItemProperty().addListener(o -> updateList()); - - JFXButton refreshButton = FXUtils.newRaisedButton(i18n("button.refresh")); - refreshButton.setOnAction(event -> control.onRefresh()); + categorySelect.setConverter((type) -> i18n("version.game." + type.name().toLowerCase(Locale.ROOT))); + categorySelect.valueProperty().addListener(o -> updateList()); - if (control.versionList.hasType()) { - searchPane.addRow(rowIndex++, - new Label(i18n("version.search")), nameField, - new Label(i18n("version.game.type")), categoryField, - refreshButton - ); - } else { - searchPane.addRow(rowIndex++, - new Label(i18n("version.search")), nameField, - refreshButton - ); - } + BorderPane.setMargin(categorySelect, new Insets(0, 10, 0, 10)); + toolbarNormal.getChildren().setAll(refreshButton, searchButton); + } else { + toolbarNormal.getChildren().setAll(refreshButton, searchButton); } + + borderPane.setCenter(toolbarPane); + toolbarPane.setContent(toolbarNormal, ContainerAnimations.FADE); + root.getContent().add(borderPane); } { - SpinnerPane spinnerPane = new SpinnerPane(); - root.setCenter(spinnerPane); - transitionPane = new TransitionPane(); + ComponentList.setVgrow(transitionPane, Priority.ALWAYS); spinner = new JFXSpinner(); - StackPane centerWrapper = new StackPane(); - centerWrapper.setStyle("-fx-padding: 10;"); - { - ComponentList centrePane = new ComponentList(); - centrePane.getStyleClass().add("no-padding"); - { - list = new JFXListView<>(); - list.getStyleClass().add("jfx-list-view-float"); - VBox.setVgrow(list, Priority.ALWAYS); - - control.versions.addListener((InvalidationListener) o -> updateList()); - - list.setCellFactory(listView -> new RemoteVersionListCell(control)); + list = new JFXListView<>(); + list.getStyleClass().add("jfx-list-view-float"); + ComponentList.setVgrow(list, Priority.ALWAYS); - ComponentList.setVgrow(list, Priority.ALWAYS); + control.versions.addListener((InvalidationListener) o -> updateList()); - // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here - ignoreEvent(list, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE); + list.setCellFactory(listView -> new RemoteVersionListCell(control)); - centrePane.getContent().setAll(list); - } - - centerWrapper.getChildren().setAll(centrePane); - } + // ListViewBehavior would consume ESC pressed event, preventing us from handling it, so we ignore it here + ignoreEvent(list, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE); StackPane failedPane = new StackPane(); failedPane.getStyleClass().add("notice-pane"); @@ -423,21 +438,32 @@ private static final class VersionsPageSkin extends SkinBase { if (status == Status.LOADING) transitionPane.setContent(spinner, ContainerAnimations.FADE); else if (status == Status.SUCCESS) - transitionPane.setContent(centerWrapper, ContainerAnimations.FADE); + transitionPane.setContent(list, ContainerAnimations.FADE); else // if (status == Status.FAILED) transitionPane.setContent(failedPane, ContainerAnimations.FADE); }); - root.setCenter(transitionPane); + root.getContent().add(transitionPane); } - this.getChildren().setAll(root); + pane.getChildren().setAll(root); + this.getChildren().setAll(pane); + } + + private void changeToolbar(HBox newToolbar) { + Node oldToolbar = toolbarPane.getCurrentNode(); + if (newToolbar != oldToolbar) { + toolbarPane.setContent(newToolbar, ContainerAnimations.FADE); + if (newToolbar == searchBar) { + FXUtils.runInFX(searchField::requestFocus); + } + } } private void updateList() { Stream versions = getSkinnable().versions.stream(); - VersionTypeFilter filter = categoryField.getSelectionModel().getSelectedItem(); + VersionTypeFilter filter = categorySelect.getValue(); if (filter != null) versions = versions.filter(it -> { RemoteVersion.Type versionType = it.getVersionType(); @@ -454,7 +480,7 @@ private void updateList() { }; }); - String nameQuery = nameField.getText(); + String nameQuery = searchField.getText(); if (!StringUtils.isBlank(nameQuery)) { if (nameQuery.startsWith("regex:")) { try { diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 399dd6bf8b..057a014552 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1970,15 +1970,15 @@ -fx-opacity: 0.4; } -.line-select-button .menu-container .title-label { +.select-popup .menu-container .title-label { -fx-font-size: 13px; } -.line-select-button .menu-container:selected .title-label { +.select-popup .menu-container:selected .title-label { -fx-text-fill: -monet-primary; } -.line-select-button .menu-container:selected .subtitle-label { +.select-popup .menu-container:selected .subtitle-label { -fx-text-fill: -monet-primary; }