Skip to content

Commit d03414e

Browse files
committed
Update .ico files, set taskbar icon icon for MacOS
1 parent 86b6fbf commit d03414e

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

Diff for: android/assets/ExtraImages/Icon.png

-8.73 KB
Binary file not shown.

Diff for: android/assets/ExtraImages/Icons/Unciv128.png

16.3 KB
Loading

Diff for: android/assets/ExtraImages/Icons/Unciv32.png

16.3 KB
Loading

Diff for: desktop/src/com/unciv/app/desktop/DesktopLauncher.kt

+20-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@ import com.unciv.utils.Display
2121
import com.unciv.utils.Log
2222
import org.lwjgl.system.Configuration
2323
import java.awt.GraphicsEnvironment
24+
import java.awt.Image
25+
import java.awt.Taskbar
26+
import java.awt.Toolkit
2427
import java.io.File
28+
import java.net.URL
2529
import kotlin.system.exitProcess
2630

31+
2732
internal object DesktopLauncher {
2833

2934
@JvmStatic
@@ -77,11 +82,13 @@ internal object DesktopLauncher {
7782
ImagePacker.packImages(isRunFromJAR)
7883

7984
val config = Lwjgl3ApplicationConfiguration()
80-
config.setWindowIcon("ExtraImages/Icon.png")
85+
config.setWindowIcon("ExtraImages/Icons/Unciv32.png", "ExtraImages/Icons/Unciv128.png")
86+
if (SharedLibraryLoader.isMac) updateDockIconForMacOs("ExtraImages/Icons/Unciv128.png")
8187
config.setTitle("Unciv")
8288
config.setHdpiMode(HdpiMode.Logical)
8389
config.setWindowSizeLimits(WindowState.minimumWidth, WindowState.minimumHeight, -1, -1)
8490

91+
8592

8693

8794
// LibGDX not yet configured, use regular java class
@@ -116,3 +123,15 @@ internal object DesktopLauncher {
116123
exitProcess(0)
117124
}
118125
}
126+
127+
private fun updateDockIconForMacOs(fileName: String) {
128+
try {
129+
val defaultToolkit: Toolkit = Toolkit.getDefaultToolkit()
130+
val imageResource: URL = FileHandle(fileName).file().toURI().toURL()
131+
val image: Image = defaultToolkit.getImage(imageResource)
132+
val taskbar = Taskbar.getTaskbar()
133+
taskbar.iconImage = image
134+
} catch (throwable: Throwable) {
135+
throwable.printStackTrace()
136+
}
137+
}

Diff for: extraImages/Icons/Unciv.ico

445 KB
Binary file not shown.

0 commit comments

Comments
 (0)