Merge pull request #66 from LabyMod/develop

Release 0.4.11

Author: jan-br

VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

ultralight-java-glfw-opengl-util/src/main/java/com/labymedia/ultralight/util/UltralightGlfwOpenGLContext.java

@@ -150,7 +150,7 @@ public Collection<UltralightGlfwOpenGLWindow> getSubWindows() {
      * @return the created sub window
      */
     public synchronized UltralightGlfwOpenGLWindow createSubWindow(int width, int height, String title) {
-        UltralightGlfwOpenGLWindow window = UltralightGlfwOpenGLWindow.create(this, width, height, title, this.getMainWindow().getWindowHandle());
+        UltralightGlfwOpenGLWindow window = UltralightGlfwOpenGLWindow.create(this, width, height, title, this.getMainWindow().getParentWindow());
         this.subWindows.add(window);
         return window;
     }

ultralight-java-glfw-opengl-util/src/main/java/com/labymedia/ultralight/util/UltralightGlfwOpenGLWindow.java

@@ -39,6 +39,7 @@
  */
 public class UltralightGlfwOpenGLWindow {
 
+    private final long parentWindow;
     private final UltralightGlfwOpenGLContext context;
     private long windowHandle;
     private UltralightView view;
@@ -54,12 +55,13 @@ public class UltralightGlfwOpenGLWindow {
      */
     private UltralightGlfwOpenGLWindow(UltralightGlfwOpenGLContext context, int width, int height, String title, long sharedWindow) {
         this.context = context;
-        initialize(width, height, title, sharedWindow);
+        this.parentWindow = sharedWindow;
+        initialize(width, height, title);
     }
 
-    private void initialize(int width, int height, String title, long sharedWindow) {
+    private void initialize(int width, int height, String title) {
         glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
-        this.windowHandle = GLFW.glfwCreateWindow(width, height, title, MemoryUtil.NULL, sharedWindow);
+        this.windowHandle = GLFW.glfwCreateWindow(width, height, title, MemoryUtil.NULL, this.parentWindow);
     }
 
     private UltralightView createView() {
@@ -292,4 +294,11 @@ public UltralightGlfwOpenGLWindow bindTexture() {
         this.context.bindTexture(this);
         return this;
     }
+
+    /**
+     * @return the specified parent window of this window or {@link MemoryUtil#NULL}.
+     */
+    public long getParentWindow() {
+        return this.parentWindow;
+    }
 }