Fix MacOS Doubled Dock Icon

sources/CMakeLists.txt

@@ -20,6 +20,7 @@ set(HEADERS
     xdtsio.h
     pathutils.h
     commandmanager.h
+    macdockicon.h
     ${MOC_HEADERS}
 )
 
@@ -56,6 +57,18 @@ else()
     message(ERROR "Unsupported build environment, only MSVC and APPLE are supported")
 endif()
 
+# macdockicon.mm is Objective-C++ (hides the mothership process's Dock icon
+# on macOS); only compiled for the Apple build, MSVC cannot build .mm files.
+# macdockicon.mm縺ｯObjective-C++��acOS縺ｧ豈崎襖繝励Ο繧ｻ繧ｹ縺ｮDock繧｢繧､繧ｳ繝ｳ繧帝國縺
+# 縺溘ａ縺ｮ繧ゅ��峨�pple繝薙Ν繝峨〒縺ｮ縺ｿ繧ｳ繝ｳ繝代う繝ｫ縺吶ｋ縲�SVC縺ｯ.mm繝輔ぃ繧､繝ｫ繧
+# 繝薙Ν繝峨〒縺阪↑縺�
+if(BUILD_ENV_APPLE)
+    set(SOURCES
+        ${SOURCES}
+        macdockicon.mm
+    )
+endif()
+
 #-----------------------------------------------------------------------------
 # Build Options
 option(WITH_TRANSLATION "Generate translation projects as well" ON)
@@ -166,6 +179,9 @@ if(BUILD_ENV_MSVC)
     target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Network ${PSD_SDK_LIB} )
 else()
     target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Network)
+    # AppKit is needed by macdockicon.mm (NSApplicationActivationPolicy).
+    # AppKit縺ｯmacdockicon.mm��SApplicationActivationPolicy�峨↓蠢�ｦ√
+    target_link_libraries(${PROJECT_NAME} "-framework AppKit")
 endif()
 
 add_definitions(

sources/instancemanager.cpp

@@ -2,6 +2,7 @@
 #include "pathutils.h"
 #include "xdtsio.h"
 #include "dialogs.h"
+#include "macdockicon.h"
 
 #include <QApplication>
 #include <QCoreApplication>
@@ -171,6 +172,17 @@ void InstanceManager::startMothership(const QString& initialPath) {
   // 明示的に制御する。
   qApp->setQuitOnLastWindowClosed(false);
 
+  // The mothership has no window, but on macOS every process that starts a
+  // Cocoa event loop still gets a Dock icon by default; hide it so the app
+  // doesn't show two Dock icons (one for this process, one for the worker
+  // window it spawns).
+  // 母艦はウィンドウを持たないが、macOSではCocoaのイベントループを開始した
+  // 各プロセスは既定でDockアイコンを持つ。起動するワーカーウィンドウの
+  // アイコンと並んで2つ表示されないよう、ここで隠す。
+#ifdef __MACOS__
+  hideDockIcon();
+#endif
+
   // Treat our own launch argument the same way as a request coming from
   // another process (always spawns a worker, since nothing is registered
   // yet at this point).

sources/macdockicon.h

@@ -0,0 +1,25 @@
+�ｿ#pragma once
+#ifndef MACDOCKICON_H
+#define MACDOCKICON_H
+
+#ifdef __MACOS__
+// Hides this process's Dock icon and Cmd+Tab entry
+// (NSApplicationActivationPolicyAccessory). The invisible mothership
+// process has no window of its own, but every process that starts a Cocoa
+// event loop gets a Dock icon by default -- without this, launching XDTS
+// Viewer shows two Dock icons (one for the mothership, one for the
+// per-file worker window) instead of one. Safe to call at any time after
+// QApplication is constructed; it does not prevent this process from
+// later showing dialogs (e.g. the CSP sync picker) in the foreground.
+// 縺薙�繝励Ο繧ｻ繧ｹ縺ｮDock繧｢繧､繧ｳ繝ｳ縺ｨCmd+Tab縺ｸ縺ｮ陦ｨ遉ｺ繧帝國縺
+// ��SApplicationActivationPolicyAccessory�峨よｯ崎襖繝励Ο繧ｻ繧ｹ縺ｯ閾ｪ霄ｫ縺ｮ
+// 繧ｦ繧｣繝ｳ繝峨え繧呈戟縺溘↑縺�′縲，ocoa縺ｮ繧､繝吶Φ繝医Ν繝ｼ繝励ｒ髢句ｧ九＠縺溷推繝励Ο繧ｻ繧ｹ縺ｯ
+// 譌｢螳壹〒Dock繧｢繧､繧ｳ繝ｳ繧1縺､謖√▽縺溘ａ縲√％繧後ｒ陦後ｏ縺ｪ縺�→XDTS Viewer襍ｷ蜍墓凾縺ｫ
+// Dock繧｢繧､繧ｳ繝ｳ縺2縺､�域ｯ崎襖逕ｨ縺ｨ繝輔ぃ繧､繝ｫ縺斐→縺ｮ繝ｯ繝ｼ繧ｫ繝ｼ繧ｦ繧｣繝ｳ繝峨え逕ｨ�芽｡ｨ遉ｺ
+// 縺輔ｌ縺ｦ縺励∪縺�２Application讒狗ｯ牙ｾ後〒縺ゅｌ縺ｰ縺�▽蜻ｼ繧薙〒繧り憶縺上√％繧後ｒ
+// 蜻ｼ繧薙□蠕後ｂ縺薙�繝励Ο繧ｻ繧ｹ縺靴SP蜷梧悄繝斐ャ繧ｫ繝ｼ縺ｪ縺ｩ縺ｮ繝繧､繧｢繝ｭ繧ｰ繧貞燕髱｢縺ｫ陦ｨ遉ｺ
+// 縺吶ｋ縺薙→縺ｯ螯ｨ縺偵ｉ繧後↑縺�
+void hideDockIcon();
+#endif
+
+#endif

sources/macdockicon.mm

@@ -0,0 +1,9 @@
+#include "macdockicon.h"
+
+#ifdef __MACOS__
+#import <AppKit/AppKit.h>
+
+void hideDockIcon() {
+  [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
+}
+#endif