From 29d152852e04bc614632d43cca0bd5b9ae1267d9 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 7 Dec 2015 15:16:25 -0800 Subject: [PATCH] should set window icon for windows. --- desktop/build-osx.json | 4 ++-- desktop/src/advent/core/desktop_launcher.clj | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/desktop/build-osx.json b/desktop/build-osx.json index 277a34e0..57263aa5 100644 --- a/desktop/build-osx.json +++ b/desktop/build-osx.json @@ -4,8 +4,8 @@ "executable": "Tick's Tales", "appjar": "target/advent-standalone.jar", "mainclass": "advent/core/desktop_launcher", - "resources": [ - ], + "resources": ["resources/icon" ], + "vmargs": ["-Xdock:icon=icon/icon_128x128.png"], "minimizejre": "soft", "outdir": "target/osx/Tick's Tales.app" } diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index a682de52..78aa50c4 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -1,10 +1,10 @@ (ns advent.core.desktop-launcher (:require [advent.core :refer :all] [advent.utils :as utils] - ) + [play-clj.core :refer :all]) (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration] [org.lwjgl.input Keyboard] - [com.badlogic.gdx Gdx]) + [com.badlogic.gdx Gdx Files$FileType]) (:gen-class)) @@ -27,6 +27,11 @@ (catch Exception e#)))) (let [cfg (LwjglApplicationConfiguration.)] + #_(println (.exists (files! :classpath "icon/icon_128x128.png"))) + (.addIcon cfg "icon/icon_128x128.png" Files$FileType/Classpath) + (.addIcon cfg "icon/icon_32x32.png" Files$FileType/Classpath) + (.addIcon cfg "icon/icon_16x16.png" Files$FileType/Classpath) + (if false (do (set! (.width cfg) (doto (.width (LwjglApplicationConfiguration/getDesktopDisplayMode)) println))