Update SCL from upstream

SolDev69 · Jun 4, 2024 · a0af92d · a0af92d
2 parents 9a9f017 + bdc7f33
commit a0af92d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java
@@ -30,7 +30,7 @@ public static CustomControls loadAndConvertIfNecessary(String jsonPath) throws I
                 return layout;
             }else if (layoutJobj.getInt("version") >= 3 && layoutJobj.getInt("version") <= 5) {
                 return LayoutConverter.convertV3_4Layout(layoutJobj);
-            } else if (layoutJobj.getInt("version") == 6) {
+            } else if (layoutJobj.getInt("version") == 6 || layoutJobj.getInt("version") == 7) {
                 return Tools.GLOBAL_GSON.fromJson(jsonLayoutData, CustomControls.class);
             } else {
                 return null;

diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java
@@ -1030,6 +1030,9 @@ public static void glfwGetWindowSize(long window, IntBuffer width, IntBuffer hei
         if (height != null) height.put(internalGetWindow(window).height);
     }
 
+    public static void glfwSetWindowSizeLimits(@NativeType("GLFWwindow *") long window, int minwidth, int minheight, int maxwidth, int maxheight) {
+    }
+
     public static void glfwSetWindowPos(long window, int x, int y) {
         internalGetWindow(window).x = x;
         internalGetWindow(window).y = y;