Skip to content

feat: 增加高对比度主题 #5973

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

Closed
glowinXD wants to merge 3 commits into from
Closed

feat: 增加高对比度主题 #5973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2543de
Modify Themes.java
glowinXD Apr 15, 2026
e6dc117
feat: 增加高对比度主题
glowinXD Apr 19, 2026
a0fa9f9
Merge branch 'HMCL-dev:main' into main
glowinXD Apr 19, 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
89 changes: 61 additions & 28 deletions HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@
*/
package org.jackhuang.hmcl.setting;

import com.google.gson.*;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
import javafx.beans.Observable;
import javafx.beans.property.*;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.collections.ObservableMap;
import javafx.collections.ObservableSet;
import javafx.scene.paint.Paint;
import java.net.Proxy;
import java.nio.file.Path;
import java.util.Map;
import java.util.TreeMap;

import org.hildan.fxgson.creators.ObservableListCreator;
import org.hildan.fxgson.creators.ObservableMapCreator;
import org.hildan.fxgson.creators.ObservableSetCreator;
Expand All @@ -36,13 +31,39 @@
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.theme.ThemeColor;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.util.gson.*;
import org.jackhuang.hmcl.util.gson.EnumOrdinalDeserializer;
import org.jackhuang.hmcl.util.gson.ObservableSetting;
import org.jackhuang.hmcl.util.gson.PaintAdapter;
import org.jackhuang.hmcl.util.gson.PathTypeAdapter;
import org.jackhuang.hmcl.util.gson.RawPreservingObjectProperty;
import org.jackhuang.hmcl.util.i18n.SupportedLocale;
import org.jetbrains.annotations.Nullable;

import java.net.Proxy;
import java.nio.file.Path;
import java.util.*;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonParseException;
import com.google.gson.ToNumberPolicy;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;

import javafx.beans.Observable;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.IntegerProperty;
import javafx.beans.property.MapProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleMapProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.collections.ObservableMap;
import javafx.collections.ObservableSet;
import javafx.scene.paint.Paint;

@JsonAdapter(value = Config.Adapter.class)
public final class Config extends ObservableSetting {
Expand Down Expand Up @@ -79,7 +100,6 @@ public String toJson() {
}

// Properties

@SerializedName("_version")
private final IntegerProperty configVersion = new SimpleIntegerProperty(CURRENT_VERSION);

Expand All @@ -96,11 +116,13 @@ public void setConfigVersion(int configVersion) {
}

/**
* The version of UI that the user have last used.
* If there is a major change in UI, {@link Config#CURRENT_UI_VERSION} should be increased.
* When {@link #CURRENT_UI_VERSION} is higher than the property, the user guide should be shown,
* then this property is set to the same value as {@link #CURRENT_UI_VERSION}.
* In particular, the property is default to 0, so that whoever open the application for the first time will see the guide.
* The version of UI that the user have last used. If there is a major
* change in UI, {@link Config#CURRENT_UI_VERSION} should be increased. When
* {@link #CURRENT_UI_VERSION} is higher than the property, the user guide
* should be shown, then this property is set to the same value as
* {@link #CURRENT_UI_VERSION}. In particular, the property is default to 0,
* so that whoever open the application for the first time will see the
* guide.
*/
@SerializedName("uiVersion")
private final IntegerProperty uiVersion = new SimpleIntegerProperty(CURRENT_UI_VERSION);
Expand Down Expand Up @@ -305,7 +327,6 @@ public void setLogLines(Integer logLines) {
}

// UI

@SerializedName("themeBrightness")
private final StringProperty themeBrightness = new SimpleStringProperty("light");

Expand All @@ -321,6 +342,21 @@ public void setThemeBrightness(String themeBrightness) {
this.themeBrightness.set(themeBrightness);
}

@SerializedName("themeContrast")
private final StringProperty themeContrast = new SimpleStringProperty("default");

public StringProperty themeContrastProperty() {
return themeContrast;
}

public String getThemeContrast() {
return themeContrast.get();
}

public void setThemeContrast(String themeContrast) {
this.themeContrast.set(themeContrast);
}

@SerializedName("theme")
private final ObjectProperty<ThemeColor> themeColor = new SimpleObjectProperty<>(ThemeColor.DEFAULT);

Expand Down Expand Up @@ -383,9 +419,9 @@ public void setLauncherFontFamily(String launcherFontFamily) {

@SerializedName("animationDisabled")
private final BooleanProperty animationDisabled = new SimpleBooleanProperty(
FXUtils.REDUCED_MOTION == Boolean.TRUE
|| !JavaRuntime.CURRENT_JIT_ENABLED
|| !FXUtils.GPU_ACCELERATION_ENABLED
Boolean.TRUE.equals(FXUtils.REDUCED_MOTION)
|| !JavaRuntime.CURRENT_JIT_ENABLED
|| !FXUtils.GPU_ACCELERATION_ENABLED
);

public BooleanProperty animationDisabledProperty() {
Expand Down Expand Up @@ -491,7 +527,6 @@ public void setBackgroundImageOpacity(int backgroundImageOpacity) {
}

// Networks

@SerializedName("autoDownloadThreads")
private final BooleanProperty autoDownloadThreads = new SimpleBooleanProperty(true);

Expand Down Expand Up @@ -688,7 +723,6 @@ public void setProxyPass(String proxyPass) {
}

// Game

@SerializedName("disableAutoGameOptions")
private final BooleanProperty disableAutoGameOptions = new SimpleBooleanProperty(false);

Expand Down Expand Up @@ -720,7 +754,6 @@ public void setAllowAutoAgent(boolean allowAutoAgent) {
}

// Accounts

@SerializedName("authlibInjectorServers")
private final ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[]{server});

Expand Down Expand Up @@ -784,7 +817,6 @@ public ObservableList<Map<Object, Object>> getAccountStorages() {
}

// Configurations

@SerializedName("last")
private final StringProperty selectedProfile = new SimpleStringProperty("");

Expand All @@ -808,6 +840,7 @@ public MapProperty<String, Profile> getConfigurations() {
}

public static final class Adapter extends ObservableSetting.Adapter<Config> {

@Override
protected Config createInstance() {
return new Config();
Expand Down
Loading