AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

rendering: don't warn about window icon on macos

Browse Source
This commit is contained in:
Bixilon 2023-02-13 17:28:08 +01:00
parent 843b29ab9a
commit 660ed439ba
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt
View File

@ -18,7 +18,7 @@ import de.bixilon.kotlinglm.vec2.Vec2i
import de.bixilon.minosoft.assets.AssetsManager import de.bixilon.minosoft.assets.AssetsManager
import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile
import de.bixilon.minosoft.terminal.RunConfiguration 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.bixilon.minosoft.util.delegate.RenderingDelegate.observeRendering
import de.matthiasmann.twl.utils.PNGDecoder import de.matthiasmann.twl.utils.PNGDecoder
import org.lwjgl.BufferUtils import org.lwjgl.BufferUtils
@ -81,7 +81,7 @@ interface BaseWindow {
fun setDefaultIcon(assetsManager: AssetsManager) { 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) val data = BufferUtils.createByteBuffer(decoder.width * decoder.height * PNGDecoder.Format.RGBA.numComponents)
decoder.decode(data, decoder.width * PNGDecoder.Format.RGBA.numComponents, PNGDecoder.Format.RGBA) decoder.decode(data, decoder.width * PNGDecoder.Format.RGBA.numComponents, PNGDecoder.Format.RGBA)
data.flip() data.flip()

3
src/main/java/de/bixilon/minosoft/gui/rendering/system/window/glfw/GLFWWindow.kt
View File

@ -411,8 +411,7 @@ class GLFWWindow(
override fun setIcon(size: Vec2i, buffer: ByteBuffer) { override fun setIcon(size: Vec2i, buffer: ByteBuffer) {
if (PlatformInfo.OS == OSTypes.MAC) { if (PlatformInfo.OS == OSTypes.MAC) {
Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.WARN) { "Can not set window icon on mac os!" } // ToDo return // the window icon can just be set with the TaskBar api. See DesktopUtil for more information
return
} }
val images = GLFWImage.malloc(1) val images = GLFWImage.malloc(1)
val image = GLFWImage.malloc() val image = GLFWImage.malloc()