Fix GLMakie embedding support

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 
+- Fixed GLMakie embedding support for window destruction [#4848](https://github.com/MakieOrg/Makie.jl/pull/4848).
 - Adjusted `DataInspector` tooltips for `spy` to be heatmap-like and `datashader` to show the number of binned markers [#4810](https://github.com/MakieOrg/Makie.jl/pull/4810)
 - Add `unsafe_set!(::Textbox, ::String)` [#4417](https://github.com/MakieOrg/Makie.jl/pull/4417)
 - Improved compatibility of marker attributes with float32convert, fixing issues with scatter markers being render too small with `markerspace = :data` in an Axis [#4869](https://github.com/MakieOrg/Makie.jl/pull/4869)

GLMakie/src/screen.jl

@@ -260,7 +260,7 @@ Makie.@noconstprop function empty_screen(debugging::Bool, reuse::Bool, window)
     owns_glscreen = isnothing(window)
     initial_resolution = (10, 10)
 
-    if isnothing(window)
+    if owns_glscreen
         windowhints = [
             (GLFW.SAMPLES,      0),
             (GLFW.DEPTH_BITS,   0),
@@ -710,8 +710,10 @@ function destroy!(screen::Screen)
     window = screen.glscreen
     if GLAbstraction.context_alive(window)
         close(screen; reuse=false)
-        GLFW.SetWindowRefreshCallback(window, nothing)
-        GLFW.SetWindowContentScaleCallback(window, nothing)
+        if screen.owns_glscreen
+            GLFW.SetWindowRefreshCallback(window, nothing)
+            GLFW.SetWindowContentScaleCallback(window, nothing)
+        end
     else
         stop_renderloop!(screen; close_after_renderloop=false)
         empty!(screen)
@@ -764,8 +766,11 @@ function Base.close(screen::Screen; reuse=true)
         push!(SCREEN_REUSE_POOL, screen)
     end
 
-    GLFW.SetWindowShouldClose(screen.glscreen, true)
-    GLFW.PollEvents()
+    if screen.owns_glscreen
+        GLFW.SetWindowShouldClose(screen.glscreen, true)
+        GLFW.PollEvents()
+    end
+
     # Somehow, on osx, we need to hide the screen a second time!
     set_screen_visibility!(screen, false)
     return

docs/src/explanations/backends/glmakie.md

@@ -80,6 +80,8 @@ do:
    - `ShaderAbstractions.native_context_alive(::MyWindow)` (check if the window
      OpenGL context is still valid)
    - `GLMakie.framebuffer_size(::MyWindow)` (get the size of the windows framebuffer)
+   - `GLMakie.destroy!(::MyWindow)` ('destroy' the window, this should be a no-op
+     unless you want GLMakie to really close the window)
    - `GLMakie.connect_screen(::Scene, Screen{MyWindow})` (connect input signals
      for e.g. the keyboard and mouse; you may want to implement the individual
      connection methods instead).