Skip to content

修复导出整合包页面中，部分输入框因宽度不够导致警告文本无法显示的问题 #6646

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

Open
Hylfrd wants to merge 2 commits into
base: main
Choose a base branch
from
+51 −24
Open

修复导出整合包页面中，部分输入框因宽度不够导致警告文本无法显示的问题 #6646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
431beb0
Fix modpack export input field layout
Hylfrd Aug 11, 2026
226ddc4
Update theme
Hylfrd Aug 12, 2026
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
75 changes: 51 additions & 24 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.jackhuang.hmcl.util.io.JarUtils;
import org.jackhuang.hmcl.util.platform.OperatingSystem;
import org.jackhuang.hmcl.util.platform.SystemInfo;
import org.jetbrains.annotations.Nullable;

import java.nio.file.Path;
import java.util.*;
Expand Down Expand Up @@ -172,7 +173,8 @@ protected Skin<?> createDefaultSkin() {
public static class ModpackInfoPageSkin extends SkinBase<ModpackInfoPage> {
private ObservableList<Node> originList;

private final List<JFXTextField> validatingFields = new ArrayList<>();
/// Tracks validation errors that disable the next button.
private final List<BooleanProperty> validationErrors = new ArrayList<>();

public ModpackInfoPageSkin(ModpackInfoPage skinnable) {
super(skinnable);
Expand Down Expand Up @@ -267,7 +269,12 @@ public ModpackInfoPageSkin(ModpackInfoPage skinnable) {
VBox pane = new VBox();

Label title = new Label(i18n("settings.memory"));
VBox.setMargin(title, new Insets(0, 0, 8, 0));
Label errorLabel = new Label();
errorLabel.getStyleClass().add("error-label");
errorLabel.setStyle("-fx-text-fill: -monet-error;");
HBox titlePane = new HBox(4, title, errorLabel);
titlePane.setAlignment(Pos.CENTER_LEFT);
VBox.setMargin(titlePane, new Insets(0, 0, 8, 0));

HBox lowerBoundPane = new HBox(8);
lowerBoundPane.setAlignment(Pos.CENTER);
Expand All @@ -293,14 +300,13 @@ public ModpackInfoPageSkin(ModpackInfoPage skinnable) {

JFXTextField txtMinMemory = new JFXTextField();
FXUtils.bindInt(txtMinMemory, skinnable.minMemory);
txtMinMemory.getValidators().add(new NumberValidator(i18n("input.number"), false));
registerValidators(txtMinMemory, errorLabel, new NumberValidator(i18n("input.number"), false));
FXUtils.setLimitWidth(txtMinMemory, 60);
validatingFields.add(txtMinMemory);

lowerBoundPane.getChildren().setAll(label, slider, txtMinMemory, new Label("MiB"));
}

pane.getChildren().setAll(title, lowerBoundPane);
pane.getChildren().setAll(titlePane, lowerBoundPane);
list.getContent().add(pane);
}

Expand Down Expand Up @@ -372,43 +378,64 @@ public ModpackInfoPageSkin(ModpackInfoPage skinnable) {
nextButton.setPrefWidth(100);
nextButton.setPrefHeight(40);
nextButton.disableProperty().bind(
// Disable nextButton if any text of JFXTextFields in validatingFields does not fulfill
// our requirement.
Bindings.createBooleanBinding(() -> validatingFields.stream()
.map(field -> !field.validate())
.reduce(false, (left, right) -> left || right),
validatingFields.stream().map(JFXTextField::textProperty).toArray(StringProperty[]::new)));
Bindings.createBooleanBinding(
() -> validationErrors.stream().anyMatch(BooleanProperty::get),
validationErrors.toArray(BooleanProperty[]::new)));
hbox.getChildren().add(nextButton);
}
}

FXUtils.smoothScrolling(scroll);
}

private LinePane createTextFieldLinePane(String title, StringProperty property, ValidatorBase... validators) {
/// Creates a compact text input row with its validation message beside the title.
private LinePane createTextFieldLinePane(String title, StringProperty property, @Nullable ValidatorBase... validators) {
LinePane linePane = new LinePane();
JFXTextField textField = new JFXTextField();
Label errorLabel = new Label();
errorLabel.getStyleClass().add("error-label");
errorLabel.setStyle("-fx-text-fill: -monet-error;");
textField.setMinWidth(500);

linePane.setTitle(title);
linePane.setTitleTrailing(errorLabel);
linePane.setRight(textField);
textField.textProperty().bindBidirectional(property);

boolean needValidation = false;
if (validators != null) {
for (ValidatorBase validator : validators) {
if (validator != null) {
needValidation = true;
textField.getValidators().add(validator);
}
registerValidators(textField, errorLabel, validators);

return linePane;
}

/// Runs validators without activating the text field skin's message below the input.
private void registerValidators(JFXTextField textField, Label errorLabel, @Nullable ValidatorBase... validators) {
List<ValidatorBase> validatorList = new ArrayList<>();
for (@Nullable ValidatorBase validator : validators) {
if (validator != null) {
validator.setSrcControl(textField);
validatorList.add(validator);
}
}
if (needValidation) {
FXUtils.setValidateWhileTextChanged(textField, true);
validatingFields.add(textField);
}
if (validatorList.isEmpty())
return;

BooleanProperty hasError = new SimpleBooleanProperty();
Runnable validate = () -> {
for (ValidatorBase validator : validatorList) {
validator.validate();
if (validator.getHasErrors()) {
errorLabel.setText(validator.getMessage());
hasError.set(true);
return;
}
}

return linePane;
errorLabel.setText(null);
hasError.set(false);
};
textField.textProperty().addListener(observable -> validate.run());
validate.run();
validationErrors.add(hasError);
}
}
}