Update .ico files, set taskbar icon icon for MacOS

Ranbut · Feb 26, 2025 · d03414e · d03414e
1 parent 86b6fbf
commit d03414e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/android/assets/ExtraImages/Icon.png b/android/assets/ExtraImages/Icon.png
diff --git a/android/assets/ExtraImages/Icons/Unciv128.png b/android/assets/ExtraImages/Icons/Unciv128.png
diff --git a/android/assets/ExtraImages/Icons/Unciv32.png b/android/assets/ExtraImages/Icons/Unciv32.png
diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
@@ -21,9 +21,14 @@ import com.unciv.utils.Display
 import com.unciv.utils.Log
 import org.lwjgl.system.Configuration
 import java.awt.GraphicsEnvironment
+import java.awt.Image
+import java.awt.Taskbar
+import java.awt.Toolkit
 import java.io.File
+import java.net.URL
 import kotlin.system.exitProcess
 
+
 internal object DesktopLauncher {
 
     @JvmStatic
@@ -77,11 +82,13 @@ internal object DesktopLauncher {
         ImagePacker.packImages(isRunFromJAR)
 
         val config = Lwjgl3ApplicationConfiguration()
-        config.setWindowIcon("ExtraImages/Icon.png")
+        config.setWindowIcon("ExtraImages/Icons/Unciv32.png", "ExtraImages/Icons/Unciv128.png")
+        if (SharedLibraryLoader.isMac) updateDockIconForMacOs("ExtraImages/Icons/Unciv128.png")
         config.setTitle("Unciv")
         config.setHdpiMode(HdpiMode.Logical)
         config.setWindowSizeLimits(WindowState.minimumWidth, WindowState.minimumHeight, -1, -1)
 
+
 
 
         // LibGDX not yet configured, use regular java class
@@ -116,3 +123,15 @@ internal object DesktopLauncher {
         exitProcess(0)
     }
 }
+
+private fun updateDockIconForMacOs(fileName: String) {
+    try {
+        val defaultToolkit: Toolkit = Toolkit.getDefaultToolkit()
+        val imageResource: URL = FileHandle(fileName).file().toURI().toURL()
+        val image: Image = defaultToolkit.getImage(imageResource)
+        val taskbar = Taskbar.getTaskbar()
+        taskbar.iconImage = image
+    } catch (throwable: Throwable) {
+        throwable.printStackTrace()
+    }
+}
diff --git a/extraImages/Icons/Unciv.ico b/extraImages/Icons/Unciv.ico