mac: Adapt app icon to Apple rounded rectangle visual style (#1167)

* mac: Adapt app icon to Apple rounded rectangle visual style * fixup the SeamlyME icon, as its set during runtime
FashionFreedom · Aug 13, 2024 · a2ac30c · a2ac30c
1 parent 6b1d110
commit a2ac30c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/dist/Seamly2D.icns b/dist/Seamly2D.icns
diff --git a/dist/SeamlyMe.icns b/dist/SeamlyMe.icns
diff --git a/src/app/seamlyme/application_me.cpp b/src/app/seamlyme/application_me.cpp
@@ -261,10 +261,15 @@ ApplicationME::ApplicationME(int &argc, char **argv)
     setOrganizationDomain(VER_COMPANYDOMAIN_STR);
     // Setting the Application version
     setApplicationVersion(APP_VERSION_STR);
-    // We have been running SeamlyMe in two different cases.
+
+    // We have been running SeamlyMe in two different cases on macOS.
     // The first inside own bundle where info.plist is works fine, but the second,
     // when we run inside Seamly2D's bundle, require direct setting the icon.
+#if defined(Q_OS_MAC)
+    setWindowIcon(QIcon(":/seamlymeicon/1024x1024/logo_mac.png"));
+#else //defined(Q_OS_MAC)
     setWindowIcon(QIcon(":/seamlymeicon/64x64/logo.png"));
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------

diff --git a/src/app/seamlyme/share/resources/seamlymeicon.qrc b/src/app/seamlyme/share/resources/seamlymeicon.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>seamlymeicon/64x64/logo.png</file>
+        <file>seamlymeicon/1024x1024/logo_mac.png</file>
         <file>seamlymeicon/16x16/info.png</file>
         <file>seamlymeicon/16x16/measurement.png</file>
         <file>seamlymeicon/24x24/fx.png</file>

diff --git a/src/app/seamlyme/share/resources/seamlymeicon/1024x1024/logo_mac.png b/src/app/seamlyme/share/resources/seamlymeicon/1024x1024/logo_mac.png