mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-01-30 14:39:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add SafeStringConverter & Refactor font settings

Browse Source
This commit is contained in:
yushijinhun 2018-10-03 16:34:55 +08:00
parent a1c5b87b55
commit 5f9490d780
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
5 changed files with 179 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java
View File

@ -33,7 +33,6 @@ import javafx.stage.Stage;
import org.jackhuang.hmcl.event.Event;
import org.jackhuang.hmcl.event.EventManager;
import org.jackhuang.hmcl.game.LauncherHelper;
import org.jackhuang.hmcl.setting.Settings;
import org.jackhuang.hmcl.util.Lang;
import org.jackhuang.hmcl.util.Log4jLevel;
import org.jackhuang.hmcl.util.StringUtils;
@ -176,7 +175,7 @@ public final class LogWindow extends Stage {
engine = webView.getEngine();
engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
.replace("${FONT}", Settings.instance().getFont().getSize() + "px \"" + Settings.instance().getFont().getFamily() + "\""));
.replace("${FONT}", config().getFontSize() + "px \"" + config().getFontFamily() + "\""));
engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
if (newValue == Worker.State.SUCCEEDED) {
document = engine.getDocument();

29
HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
View File

@ -36,8 +36,8 @@ import org.jackhuang.hmcl.upgrade.RemoteVersion;
import org.jackhuang.hmcl.upgrade.UpdateChannel;
import org.jackhuang.hmcl.upgrade.UpdateChecker;
import org.jackhuang.hmcl.upgrade.UpdateHandler;
import org.jackhuang.hmcl.util.Lang;
import org.jackhuang.hmcl.util.i18n.Locales;
import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
import java.net.Proxy;
import java.util.Arrays;
@ -64,24 +64,19 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
selectedItemPropertyFor(cboDownloadSource).bindBidirectional(config().downloadTypeProperty());
// ====
cboFont.initValue(Settings.instance().getFont());
cboFont.valueProperty().addListener((a, b, newValue) -> {
Font font = Font.font(newValue, Settings.instance().getFont().getSize());
Settings.instance().setFont(font);
lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
});
// ==== Font ====
cboFont.valueProperty().bindBidirectional(config().fontFamilyProperty());
txtFontSize.setText(Double.toString(Settings.instance().getFont().getSize()));
txtFontSize.getValidators().add(new Validator(it -> Lang.toDoubleOrNull(it) != null));
txtFontSize.textProperty().addListener((a, b, newValue) -> {
if (txtFontSize.validate()) {
Font font = Font.font(Settings.instance().getFont().getFamily(), Double.parseDouble(newValue));
Settings.instance().setFont(font);
lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
}
});
txtFontSize.textProperty().bindBidirectional(config().fontSizeProperty(),
SafeStringConverter.fromFiniteDouble()
.restrict(it -> it > 0)
.fallbackTo(12.0)
.asPredicate(Validator.addTo(txtFontSize)));
lblDisplay.setStyle("-fx-font: " + Settings.instance().getFont().getSize() + " \"" + Settings.instance().getFont().getFamily() + "\";");
lblDisplay.fontProperty().bind(Bindings.createObjectBinding(
() -> Font.font(config().getFontFamily(), config().getFontSize()),
config().fontFamilyProperty(), config().fontSizeProperty()));
// ====
// ==== Languages ====
cboLanguage.getItems().setAll(Locales.LOCALES);

28
HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/FontComboBox.java
View File

@ -17,20 +17,26 @@
*/
package org.jackhuang.hmcl.ui.construct;
import static javafx.collections.FXCollections.emptyObservableList;
import static javafx.collections.FXCollections.observableList;
import static javafx.collections.FXCollections.singletonObservableList;
import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
import com.jfoenix.controls.JFXComboBox;
import javafx.beans.NamedArg;
import javafx.beans.binding.Bindings;
import javafx.scene.control.ListCell;
import javafx.scene.text.Font;
public class FontComboBox extends JFXComboBox<String> {
private boolean loaded = false;
public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize,
@NamedArg(value = "enableStyle", defaultValue = "false") boolean enableStyle) {
valueProperty().addListener((a, b, newValue) -> {
if (enableStyle)
setStyle("-fx-font-family: \"" + newValue + "\";");
});
styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));
setCellFactory(listView -> new ListCell<String>() {
@Override
@ -43,15 +49,15 @@ public class FontComboBox extends JFXComboBox<String> {
}
});
itemsProperty().bind(MultiStepBinding.of(valueProperty())
.map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));
setOnMouseClicked(e -> {
if (loaded) return;
getItems().setAll(Font.getFamilies());
if (loaded)
return;
itemsProperty().unbind();
setItems(observableList(Font.getFamilies()));
loaded = true;
});
}
public void initValue(Font font) {
getItems().setAll(font.getFamily());
getSelectionModel().select(font.getFamily());
}
}

25
HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/Validator.java
View File

@ -17,12 +17,37 @@
*/
package org.jackhuang.hmcl.ui.construct;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.validation.base.ValidatorBase;
import javafx.beans.InvalidationListener;
import javafx.beans.WeakInvalidationListener;
import javafx.scene.control.TextInputControl;
import java.util.function.Consumer;
import java.util.function.Predicate;
import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
public final class Validator extends ValidatorBase {
public static Consumer<Predicate<String>> addTo(JFXTextField control) {
return addTo(control, null);
}
/**
* @see SafeStringConverter#asPredicate(Consumer)
*/
public static Consumer<Predicate<String>> addTo(JFXTextField control, String message) {
return predicate -> {
Validator validator = new Validator(message, predicate);
InvalidationListener listener = any -> control.validate();
validator.getProperties().put(validator, listener);
control.textProperty().addListener(new WeakInvalidationListener(listener));
control.getValidators().add(validator);
};
}
private final Predicate<String> validator;
/**

124
HMCLCore/src/main/java/org/jackhuang/hmcl/util/javafx/SafeStringConverter.java Normal file
View File

@ -0,0 +1,124 @@
/*
* Hello Minecraft! Launcher.
* Copyright (C) 2018 huangyuhui <huanghongxun2008@126.com>
*
* 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 {http://www.gnu.org/licenses/}.
*/
package org.jackhuang.hmcl.util.javafx;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Predicate;
import org.jackhuang.hmcl.util.function.ExceptionalFunction;
import javafx.util.StringConverter;
/**
* @author yushijinhun
*/
public class SafeStringConverter<S extends T, T> extends StringConverter<T> {
public static SafeStringConverter<Integer, Number> fromInteger() {
return new SafeStringConverter<Integer, Number>(Integer::parseInt, NumberFormatException.class)
.fallbackTo(0);
}
public static SafeStringConverter<Double, Number> fromDouble() {
return new SafeStringConverter<Double, Number>(Double::parseDouble, NumberFormatException.class)
.fallbackTo(0.0);
}
public static SafeStringConverter<Double, Number> fromFiniteDouble() {
return new SafeStringConverter<Double, Number>(Double::parseDouble, NumberFormatException.class)
.restrict(Double::isFinite)
.fallbackTo(0.0);
}
private ExceptionalFunction<String, S, ?> converter;
private Class<?> malformedExceptionClass;
private S fallbackValue = null;
private List<Predicate<S>> restrictions = new ArrayList<>();
public <E extends Exception> SafeStringConverter(ExceptionalFunction<String, S, E> converter, Class<E> malformedExceptionClass) {
this.converter = converter;
this.malformedExceptionClass = malformedExceptionClass;
}
@Override
public String toString(T object) {
return object == null ? "" : object.toString();
}
@Override
public S fromString(String string) {
return tryParse(string).orElse(fallbackValue);
}
private Optional<S> tryParse(String string) {
if (string == null) {
return Optional.empty();
}
S converted;
try {
converted = converter.apply(string);
} catch (Exception e) {
if (malformedExceptionClass.isInstance(e)) {
return Optional.empty();
}
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
} else {
throw new RuntimeException(e);
}
}
if (!filter(converted)) {
return Optional.empty();
}
return Optional.of(converted);
}
protected boolean filter(S value) {
for (Predicate<S> restriction : restrictions) {
if (!restriction.test(value)) {
return false;
}
}
return true;
}
public SafeStringConverter<S, T> fallbackTo(S fallbackValue) {
this.fallbackValue = fallbackValue;
return this;
}
public SafeStringConverter<S, T> restrict(Predicate<S> condition) {
this.restrictions.add(condition);
return this;
}
public Predicate<String> asPredicate() {
return string -> tryParse(string).isPresent();
}
public SafeStringConverter<S, T> asPredicate(Consumer<Predicate<String>> consumer) {
consumer.accept(asPredicate());
return this;
}
}