correctly implement resize_to for tuples (#4009)

* correctly implement resize_to for tuples * add changelog entry
MakieOrg · Jul 7, 2024 · 682ae88 · 682ae88
1 parent de1dfc3
commit 682ae88
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 
+- Fixed tuple argument for `WGLMakie.activate!(resize_to=(:parent, nothing))` [#4009](https://github.com/MakieOrg/Makie.jl/pull/4009).
 - validate plot attributes later, for axis specific plot attributes [#3974](https://github.com/MakieOrg/Makie.jl/pull/3974).
 
 ## [0.21.4] - 2024-07-02

diff --git a/WGLMakie/src/wglmakie.bundled.js b/WGLMakie/src/wglmakie.bundled.js
@@ -22932,18 +22932,34 @@ function add_canvas_events(screen, comm, resize_to) {
             [width, height] = get_body_size();
         } else if (resize_to == "parent") {
             [width, height] = get_parent_size(canvas);
+        } else if (resize_to.length == 2) {
+            [width, height] = get_parent_size(canvas);
+            const [_width, _height] = resize_to;
+            const [f_width, f_height] = [
+                screen.renderer._width,
+                screen.renderer._height
+            ];
+            console.log(`rwidht: ${_width}, rheight: ${_height}`);
+            width = _width == "parent" ? width : f_width;
+            height = _height == "parent" ? height : f_height;
+            console.log(`widht: ${width}, height: ${height}`);
+        } else {
+            console.warn("Invalid resize_to option");
+            return;
+        }
+        if (height > 0 && width > 0) {
+            comm.notify({
+                resize: [
+                    width / winscale,
+                    height / winscale
+                ]
+            });
         }
-        comm.notify({
-            resize: [
-                width / winscale,
-                height / winscale
-            ]
-        });
     }
     if (resize_to) {
         const resize_callback_throttled = throttle_function(resize_callback, 100);
         window.addEventListener("resize", (event)=>resize_callback_throttled());
-        resize_callback_throttled();
+        setTimeout(resize_callback, 50);
     }
 }
 function threejs_module(canvas) {

diff --git a/WGLMakie/src/wglmakie.js b/WGLMakie/src/wglmakie.js
@@ -313,9 +313,25 @@ function add_canvas_events(screen, comm, resize_to) {
             [width, height] = get_body_size();
         } else if (resize_to == "parent") {
             [width, height] = get_parent_size(canvas);
+        } else if (resize_to.length == 2) {
+            [width, height] = get_parent_size(canvas);
+            const [_width, _height] = resize_to;
+            const [f_width, f_height] = [
+                screen.renderer._width,
+                screen.renderer._height,
+            ];
+            console.log(`rwidht: ${_width}, rheight: ${_height}`);
+            width = _width == "parent" ? width : f_width;
+            height = _height == "parent" ? height : f_height;
+            console.log(`widht: ${width}, height: ${height}`);
+        } else {
+            console.warn("Invalid resize_to option");
+            return;
+        }
+        if (height > 0 && width > 0) {
+            // Send the resize event to Julia
+            comm.notify({ resize: [width / winscale, height / winscale] });
         }
-        // Send the resize event to Julia
-        comm.notify({ resize: [width / winscale, height / winscale] });
     }
     if (resize_to) {
         const resize_callback_throttled = throttle_function(
@@ -326,7 +342,9 @@ function add_canvas_events(screen, comm, resize_to) {
             resize_callback_throttled()
         );
         // Fire the resize event once at the start to auto-size our window
-        resize_callback_throttled();
+        // Without setTimeout, the parent doesn't have the right size yet?
+        // TODO, there should be a way to do this cleanly
+        setTimeout(resize_callback, 50);
     }
 }