-
Notifications
You must be signed in to change notification settings - Fork 871
Add UI scale setting to personalization page #6061
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.
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
aftree-sp
wants to merge
4
commits into
HMCL-dev:main
Choose a base branch
from
aftree-sp:feature/ui-scale-setting
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
4680674
Add UI scale setting to personalization page
aftree-sp 0ba141d
Add missing translation keys for I18N_zh (Traditional Chinese)
aftree-sp b4ed094
Remove local-only ignore rules from .gitignore (moved to .git/info/ex…
aftree-sp b41e4f8
Use ConfigHolder.GLOBAL_CONFIG_PATH instead of hardcoding config.json…
aftree-sp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,3 +71,4 @@ language-subtag-registry | |
| !/.gemini/config.yaml | ||
| .codex | ||
| /.gradle-*/ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ | |
| */ | ||
| package org.jackhuang.hmcl; | ||
|
|
||
| import org.jackhuang.hmcl.setting.ConfigHolder; | ||
| import org.jackhuang.hmcl.util.FileSaver; | ||
| import org.jackhuang.hmcl.util.SelfDependencyPatcher; | ||
| import org.jackhuang.hmcl.util.SwingUtils; | ||
|
|
@@ -25,6 +26,8 @@ | |
| import org.jackhuang.hmcl.util.io.JarUtils; | ||
| import org.jackhuang.hmcl.util.platform.OperatingSystem; | ||
|
|
||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonParser; | ||
| import javax.swing.JOptionPane; | ||
| import java.io.IOException; | ||
| import java.lang.invoke.MethodHandle; | ||
|
|
@@ -52,6 +55,7 @@ public static void main(String[] args) { | |
|
|
||
| checkWine(); | ||
|
|
||
| applyUiScaleFromGlobalConfig(); | ||
| setupJavaFXVMOptions(); | ||
|
|
||
| if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) { | ||
|
|
@@ -74,6 +78,33 @@ public static void exit(int exitCode) { | |
| System.exit(exitCode); | ||
| } | ||
|
|
||
| /// Reads the UI scale from the global config file and sets it as the {@code hmcl.uiScale} system property, | ||
| /// so that {@link #setupJavaFXVMOptions()} can apply it before JavaFX initializes. | ||
| /// This is needed because the config is normally loaded after JavaFX starts. | ||
| private static void applyUiScaleFromGlobalConfig() { | ||
| if (System.getProperty("hmcl.uiScale") != null || System.getenv("HMCL_UI_SCALE") != null) { | ||
| return; // already set via command line or environment variable | ||
| } | ||
|
|
||
| try { | ||
| if (!Files.isRegularFile(ConfigHolder.GLOBAL_CONFIG_PATH)) { | ||
| return; | ||
| } | ||
|
|
||
| String content = Files.readString(ConfigHolder.GLOBAL_CONFIG_PATH); | ||
| JsonObject json = JsonParser.parseString(content).getAsJsonObject(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 配置文件会在 而且设置了此选项后 HMCL 将无法感知多显示器下的不同缩放比,非常不符合用户直觉。这样的功能只适合作为一种调试参数和 workaround 使用,这也是我们只支持通过环境变量和 JVM 选项控制此选项的主要原因。我们更希望未来 JavaFX 提供了更智能的控制方式后再添加相关的设置项。 |
||
| if (json.has("uiScale") && !json.get("uiScale").isJsonNull()) { | ||
| String uiScale = json.get("uiScale").getAsString(); | ||
| if (uiScale != null && !uiScale.isEmpty()) { | ||
| System.setProperty("hmcl.uiScale", uiScale); | ||
| LOG.info("Applied UI scale from global config: " + uiScale); | ||
| } | ||
| } | ||
| } catch (Throwable e) { | ||
| LOG.warning("Failed to read UI scale from global config", e); | ||
| } | ||
| } | ||
|
|
||
| private static void setupJavaFXVMOptions() { | ||
| if ("true".equalsIgnoreCase(System.getenv("HMCL_FORCE_GPU"))) { | ||
| LOG.info("HMCL_FORCE_GPU: true"); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.