Update for GLMakie v0.11 (#22)

Require GLMakie v0.11.

Author: jwahlstrand

Project.toml

@@ -22,16 +22,16 @@ CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 Gtk4MakieCairoMakieExt = "CairoMakie"
 
 [compat]
-CairoMakie = "0.11, 0.12"
+CairoMakie = "0.13"
 Colors = "0.11, 0.12, 0.13"
 FileIO = "1.10"
 FixedPointNumbers = "0.7, 0.8"
-GLMakie = "0.10.16"
-GeometryBasics = "0.4.11"
+GLMakie = "0.11"
+GeometryBasics = "0.5"
 Gtk4 = "0.7"
-Makie = "0.21"
+Makie = "0.22"
 ModernGL = "1"
 PrecompileTools = "1"
 Preferences = "1"
-ShaderAbstractions = "0.4"
+ShaderAbstractions = "0.5"
 julia = "1.10"

examples/interactive.jl

@@ -18,6 +18,7 @@ g=grid(screen)
 g[1,2]=GtkButton("Generate new random plot")
 
 function gen_cb(b)
+    Gtk4.make_current(glarea(screen))
     empty!(ax)
     lines!(ax,rand(10))
 end

src/events.jl

@@ -41,7 +41,7 @@ function calc_dpi(m::GdkMonitor)
     min(wdpi,hdpi)
 end
 
-function _glarea_resize_cb(aptr, w, h, user_data)
+@guarded function _glarea_resize_cb(aptr, w, h, user_data)
     dpi, area, winscale = user_data
     a = convert(GtkGLArea, aptr)::GtkGLMakie
     m=Gtk4.monitor(a)

src/screen.jl

@@ -64,7 +64,7 @@ function _create_screen(a::GtkGLMakie, w, config, s)
     # This is important for resource tracking, and only needed for the first context
     shader_cache = GLAbstraction.ShaderCache(a)
     ShaderAbstractions.switch_context!(a)
-    fb = GLFramebuffer(s)
+    fb = GLFramebuffer(a, s)
 
     postprocessors = [
         config.ssao ? ssao_postprocessor(fb, shader_cache) : empty_postprocessor(),
@@ -176,19 +176,21 @@ end
 function Base.resize!(screen::Screen{T}, w::Int, h::Int) where T <: GtkWidget
     window = Makie.to_native(screen)
     (w > 0 && h > 0 && isopen(window)) || return nothing
-    
-    ShaderAbstractions.switch_context!(window)
-    winscale = screen.scalefactor[] / Gtk4.scale_factor(window)
-    winw, winh = round.(Int, winscale .* (w, h))
-    if size(window) != (winw, winh)
-        size_change(window, winw, winh)
-    end
 
     # Then resize the underlying rendering framebuffers as well, which can be scaled
     # independently of the window scale factor.
     fbscale = screen.px_per_unit[]
     fbw, fbh = round.(Int, fbscale .* (w, h))
     resize!(screen.framebuffer, fbw, fbh)
+
+    winscale = screen.scalefactor[] / Gtk4.scale_factor(window)
+    winw, winh = round.(Int, winscale .* (w, h))
+    if size(window) != (winw, winh)
+        size_change(window, winw, winh)
+    end
+
+    screen.size = (fbw, fbh)
+
     return nothing
 end
 

src/widget.jl

@@ -25,7 +25,7 @@ end
 
 glarea(screen::GLMakie.Screen{T}) where T <: GtkGLArea = screen.glscreen
 window(screen::GLMakie.Screen{T}) where T <: GtkGLArea = toplevel(screen.glscreen)
-size_change(g::GtkGLArea, w, h) = nothing
+size_change(win::GtkGLArea, w, h) = nothing
 
 ##
 

src/window.jl

@@ -31,6 +31,14 @@ function GLMakie.destroy!(screen::GLMakie.Screen{T}) where T <: GtkWindow
     return
 end
 
+function GLMakie.GLAbstraction.require_context(ctx::GtkGLMakie, current::GtkWindowLeaf)
+    return nothing
+end
+
+function GLMakie.GLAbstraction.require_context(ctx::GtkWindowLeaf, current::GtkGLMakie)
+    return nothing
+end
+
 GLMakie.framebuffer_size(w::GtkWindow) = GLMakie.framebuffer_size(win2glarea[w])
 
 function ShaderAbstractions.native_switch_context!(w::GtkWindow)