From 02a93a96824ddd3f16eb617cababdfdb0f03909f Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 30 Jun 2021 17:30:51 +0200 Subject: [PATCH] fix window centering on start --- .../minosoft/gui/rendering/system/window/GLFWWindow.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt index 3af82418b..0d92685f2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt @@ -29,6 +29,7 @@ import org.lwjgl.glfw.GLFW.* import org.lwjgl.glfw.GLFWErrorCallback import org.lwjgl.system.MemoryUtil + class GLFWWindow( private val eventMaster: EventMaster, ) : BaseWindow { @@ -43,7 +44,7 @@ class GLFWWindow( field = value } - private var _size = DEFAULT_WINDOW_SIZE + private var _size = Vec2i(DEFAULT_WINDOW_SIZE) override var size: Vec2i get() = _size @@ -132,13 +133,14 @@ class GLFWWindow( throw RuntimeException("Failed to create the GLFW window") } + glfwMakeContextCurrent(window) + + super.init() val videoMode = glfwGetVideoMode(glfwGetPrimaryMonitor())!! glfwSetWindowPos(window, (videoMode.width() - size.x) / 2, (videoMode.height() - size.y) / 2) - glfwMakeContextCurrent(window) - glfwSetKeyCallback(window, this::keyInput) glfwSetMouseButtonCallback(window, this::mouseKeyInput) @@ -151,8 +153,6 @@ class GLFWWindow( glfwSetWindowCloseCallback(window, this::onClose) glfwSetWindowFocusCallback(window, this::onFocusChange) glfwSetWindowIconifyCallback(window, this::onIconify) - - super.init() } override fun destroy() {