-
Notifications
You must be signed in to change notification settings - Fork 866
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
2
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
2 commits
Select commit
Hold shift + click to select a range
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
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 |
|---|---|---|
|
|
@@ -25,6 +25,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 +54,7 @@ public static void main(String[] args) { | |
|
|
||
| checkWine(); | ||
|
|
||
| applyUiScaleFromGlobalConfig(); | ||
| setupJavaFXVMOptions(); | ||
|
|
||
| if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) { | ||
|
|
@@ -74,6 +77,34 @@ 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 { | ||
| Path configPath = Metadata.HMCL_GLOBAL_DIRECTORY.resolve("config.json"); | ||
|
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. 不要在外面再硬编码一次 |
||
| if (!Files.isRegularFile(configPath)) { | ||
| return; | ||
| } | ||
|
|
||
| String content = Files.readString(configPath); | ||
| JsonObject json = JsonParser.parseString(content).getAsJsonObject(); | ||
| 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个是多出来的么
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这似乎是由 LLM 完成的 PR,从
.workbuddy/可知,这应该是为了防止这些工具相关的文件被上传There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
防止我的其他文件被上传的
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
忽略本地文件应当用
.git/info/exclude