From 660ed439bab94790b74a6102a3cc730839956e02 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Mon, 13 Feb 2023 17:28:08 +0100 Subject: [PATCH] rendering: don't warn about window icon on macos --- .../minosoft/gui/rendering/system/window/BaseWindow.kt | 4 ++-- .../minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt index 39cb61054..087612c1c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt @@ -18,7 +18,7 @@ import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.terminal.RunConfiguration -import de.bixilon.minosoft.util.KUtil.toResourceLocation +import de.bixilon.minosoft.util.DesktopUtil import de.bixilon.minosoft.util.delegate.RenderingDelegate.observeRendering import de.matthiasmann.twl.utils.PNGDecoder import org.lwjgl.BufferUtils @@ -81,7 +81,7 @@ interface BaseWindow { fun setDefaultIcon(assetsManager: AssetsManager) { - val decoder = PNGDecoder(assetsManager["minosoft:textures/icons/window_icon.png".toResourceLocation()]) + val decoder = PNGDecoder(assetsManager[DesktopUtil.ICON]) val data = BufferUtils.createByteBuffer(decoder.width * decoder.height * PNGDecoder.Format.RGBA.numComponents) decoder.decode(data, decoder.width * PNGDecoder.Format.RGBA.numComponents, PNGDecoder.Format.RGBA) data.flip() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt index 4656057e2..ab1ada6d4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt @@ -411,8 +411,7 @@ class GLFWWindow( override fun setIcon(size: Vec2i, buffer: ByteBuffer) { if (PlatformInfo.OS == OSTypes.MAC) { - Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.WARN) { "Can not set window icon on mac os!" } // ToDo - return + return // the window icon can just be set with the TaskBar api. See DesktopUtil for more information } val images = GLFWImage.malloc(1) val image = GLFWImage.malloc()