只在未被打包为 App 时设置 macOS Dock 栏图标 by AnemoFlower · Pull Request #4698 · HMCL-dev/HMCL

AnemoFlower · 2025-10-19T02:08:48Z

不在 HMCL 被打包为 App 时设置 macOS Dock 栏图标，以支持 ShulkerSakura/HMCL-MacOS 自定义图标。

Copilot

Pull Request Overview

为 macOS 引入环境变量 HMCL_MACOS_SET_ICON，用于控制是否设置 Dock 图标，便于 HMCL-MacOS 自定义图标集成。

在 EntryPoint 中仅当 macOS 且 HMCL_MACOS_SET_ICON=true 时才调用 initIcon
在中文调试文档中新增 HMCL_MACOS_SET_ICON 的说明，默认值为 true

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
docs/Debug_zh.md	新增 HMCL_MACOS_SET_ICON 环境变量的文档条目，说明默认值
HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java	使用环境变量开关控制 macOS 下 initIcon 的执行

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

docs/Debug_zh.md

burningtnt

Copilot 的建议是对的。为避免与“应用图标/文件图标”混淆，建议明确为“程序坞图标（Dock）”。当然，不区分大小写这种东西…… 你得看看 HMCL 其他地方支不支持大小写混用

Glavo · 2025-10-22T12:45:26Z

我感觉可以不用一个环境变量来控制，而是让 HMCL 主动检测自己是否被打包为了 dmg 等格式。

AnemoFlower · 2025-10-23T03:48:05Z

当前逻辑为：如果 HMCL 目录路径中包含 Contents，且其前一个路径组件以 .app 结尾，则不会设置 macOS Dock 栏图标。

WhatDamon · 2025-10-24T09:55:01Z

当前逻辑为：如果 HMCL 目录路径中包含 Contents，且其前一个路径组件以 .app 结尾，则不会设置 macOS Dock 栏图标。

可以进一步添加一个逻辑，检查Contents目录是否包含Info.plist，没有该文件macOS无法正确处理App Bundle，并且让此检测逻辑只在macOS下生效，避免未来与此更改有关的Issue（虽然概率极低）

Glavo · 2025-10-25T12:32:39Z

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

    }

+    private static boolean isMacDockIconDisabled() {
+        Path directory = JarUtils.thisJarPath();


为什么要叫 directory？这明明是 JAR 的路径。

Glavo · 2025-10-25T12:34:31Z

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

+            return false;
+
+        for (int i = 1; i < directory.getNameCount(); i++) {
+            Path subpath = directory.getRoot().resolve(directory.subpath(0, i));


为什么要这样遍历，而不是从 JAR 开始逐级向父目录查询？

Copilot

Pull Request Overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

Glavo · 2025-10-27T13:31:21Z

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

+
+        while (jarPath != null && jarPath.getParent() != null) {
+            if ("Contents".equals(jarPath.getFileName().toString())
+                    && jarPath.getParent().getFileName().toString().endsWith(".app")


这里不安全，要是 getParent() 返回 / 的话，那么它的 getFileName() 会返回 null，这里就会抛出 NPE 了。

Copilot

Pull Request Overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-10-27T13:38:16Z

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

+             current != null && current.getParent() != null;
+             current = current.getParent()
+        ) {
+            if ("Contents".equals(FileUtils.getName(current))


The loop condition current.getParent() != null may cause the loop to terminate prematurely when checking paths near the root directory. If the JAR is located in /Applications/MyApp.app/Contents/Java/app.jar, the loop should check the MyApp.app level, but it will stop before reaching it because it requires the parent of MyApp.app (which is /Applications) to also have a parent. Remove the current.getParent() != null condition from the loop.

Suggested change

current != null && current.getParent() != null;

current = current.getParent()

) {

if ("Contents".equals(FileUtils.getName(current))

current != null;

current = current.getParent()

) {

if ("Contents".equals(FileUtils.getName(current))

&& current.getParent() != null

Copilot · 2025-10-27T13:38:17Z

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

+            if ("Contents".equals(FileUtils.getName(current))
+                    && FileUtils.getName(current.getParent()).endsWith(".app")


Potential NullPointerException when calling current.getParent() on line 175. Although the loop condition checks current != null, it doesn't guarantee that current.getParent() is non-null when the condition on line 174 is true. Add a null check before accessing current.getParent().

Suggested change

if ("Contents".equals(FileUtils.getName(current))

&& FileUtils.getName(current.getParent()).endsWith(".app")

Path parent = current.getParent();

if (parent != null

&& "Contents".equals(FileUtils.getName(current))

&& FileUtils.getName(parent).endsWith(".app")

feat: 添加 HMCL_MACOS_SET_ICON 环境变量

141ae91

Copilot AI review requested due to automatic review settings October 19, 2025 02:08

Copilot AI reviewed Oct 19, 2025

View reviewed changes

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java Outdated Show resolved Hide resolved

docs/Debug_zh.md Outdated Show resolved Hide resolved

fix

e435e97

burningtnt suggested changes Oct 19, 2025

View reviewed changes

AnemoFlower mentioned this pull request Oct 19, 2025

在macOS上打包的.app版HMCL正确显示图标 ShulkerSakura/HMCL-MacOS#2

Closed

update

885b3f9

burningtnt mentioned this pull request Oct 18, 2025

PR Collection 开发进展 burningtnt/HMCL#9

Closed

chore: 移除新增的环境变量，改为判断是否在 app 内部

fcf2a5b

AnemoFlower changed the title ~~添加 HMCL_MACOS_SET_ICON 环境变量~~ 只在未打包为 App 时设置 macOS Dock 栏图标 Oct 23, 2025

feat: Info.plist 检查

bc78bb1

AnemoFlower changed the title ~~只在未打包为 App 时设置 macOS Dock 栏图标~~ 只在未被打包为 App 时设置 macOS Dock 栏图标 Oct 25, 2025

Glavo reviewed Oct 25, 2025

View reviewed changes

fix

ec8086c

AnemoFlower requested a review from Glavo October 25, 2025 13:18

Glavo requested a review from Copilot October 27, 2025 13:25

Copilot AI reviewed Oct 27, 2025

View reviewed changes

HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java Outdated Show resolved Hide resolved

update

c3069f0

Glavo reviewed Oct 27, 2025

View reviewed changes

Glavo requested a review from Copilot October 27, 2025 13:36

Copilot AI reviewed Oct 27, 2025

View reviewed changes

Glavo merged commit 322e296 into HMCL-dev:main Oct 27, 2025
2 checks passed

WhatDamon mentioned this pull request Dec 12, 2025

[Feature] 在 macOS App 下将游戏与配置文件存放在 Application Support 而非 JAR 所在目录 #4765

Closed

AnemoFlower deleted the macos-set-icon branch March 2, 2026 07:55

		if ("Contents".equals(FileUtils.getName(current))
		&& FileUtils.getName(current.getParent()).endsWith(".app")

-            if ("Contents".equals(FileUtils.getName(current))
-                    && FileUtils.getName(current.getParent()).endsWith(".app")
+            Path parent = current.getParent();
+            if (parent != null
+                    && "Contents".equals(FileUtils.getName(current))
+                    && FileUtils.getName(parent).endsWith(".app")

Conversation

AnemoFlower commented Oct 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

burningtnt left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Glavo commented Oct 22, 2025

Uh oh!

AnemoFlower commented Oct 23, 2025

Uh oh!

WhatDamon commented Oct 24, 2025

Uh oh!

Glavo Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Glavo Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Glavo Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Copilot AI Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

AnemoFlower commented Oct 19, 2025 •

edited

Loading

burningtnt left a comment •

edited

Loading