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

bump lwjgl, fix crash on wayland with multiple screens

Browse Source
This commit is contained in:
Bixilon 2021-11-02 19:17:36 +01:00
parent 3529ece9ea
commit 4d904e92e3
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -198,7 +198,7 @@
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target> <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
<javafx.version>18-ea+4</javafx.version> <javafx.version>18-ea+4</javafx.version>
<kotlin.version>1.5.21</kotlin.version> <kotlin.version>1.5.21</kotlin.version>
<lwjgl.version>3.2.3</lwjgl.version> <lwjgl.version>3.3.0-SNAPSHOT</lwjgl.version>
</properties> </properties>
@ -207,6 +207,17 @@
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories> </repositories>
@ -273,22 +284,27 @@
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl</artifactId> <artifactId>lwjgl</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-glfw</artifactId> <artifactId>lwjgl-glfw</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-openal</artifactId> <artifactId>lwjgl-openal</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-opengl</artifactId> <artifactId>lwjgl-opengl</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>
<artifactId>lwjgl-stb</artifactId> <artifactId>lwjgl-stb</artifactId>
<version>${lwjgl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>

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

@ -144,9 +144,12 @@ class GLFWWindow(
super.init() super.init()
val videoMode = glfwGetVideoMode(glfwGetPrimaryMonitor())!! val primaryMonitor = glfwGetPrimaryMonitor()
if (primaryMonitor != 0L) {
glfwSetWindowPos(window, (videoMode.width() - size.x) / 2, (videoMode.height() - size.y) / 2) glfwGetVideoMode(primaryMonitor)?.let {
glfwSetWindowPos(window, (it.width() - size.x) / 2, (it.height() - size.y) / 2)
}
}
glfwSetKeyCallback(window, this::keyInput) glfwSetKeyCallback(window, this::keyInput)