allow Gtk4 v0.7 (#20)

Author: jwahlstrand

.github/workflows/ci.yml

@@ -15,7 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         julia-version:
-          #- "1.6"
           - "1"
           #- "nightly"
         os:
@@ -45,11 +44,3 @@ jobs:
       - uses: julia-actions/julia-runtest@latest
         with:
           prefix: ${{ matrix.prefix }}
-      - uses: julia-actions/julia-processcoverage@latest
-        if: startsWith(matrix.os, 'ubuntu')
-        with:
-          directories: src
-      - uses: codecov/codecov-action@v3
-        if: startsWith(matrix.os, 'ubuntu')
-        with:
-          file: lcov.info

Project.toml

@@ -1,6 +1,6 @@
 name = "Gtk4Makie"
 uuid = "478199e7-b407-4926-87ea-7196203a28d8"
-version = "0.2.6"
+version = "0.3.0"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -23,13 +23,13 @@ Gtk4MakieCairoMakieExt = "CairoMakie"
 [compat]
 CairoMakie = "0.11, 0.12"
 Colors = "0.11, 0.12"
-FileIO = "1.9"
+FileIO = "1.10"
 GLMakie = "0.10.7"
-GeometryBasics = "0.4.1"
-Gtk4 = "0.6.6"
+GeometryBasics = "0.4.11"
+Gtk4 = "0.7"
 Makie = "0.21"
 ModernGL = "1"
 PrecompileTools = "1"
 Preferences = "1"
 ShaderAbstractions = "0.4"
-julia = "1.9"
+julia = "1.10"

src/attributes.jl

@@ -454,7 +454,6 @@ function attributes_window(f=current_figure())
     q=findfirst(s->glarea(s).figure == f, screens)
     if q !== nothing
         screen_window = window(screens[q])
-        Gtk4.transient_for(win, screen_window)
         signal_connect(screen_window,"close-request") do w
             destroy(win)
             return false

src/settings_widgets.jl

@@ -52,14 +52,15 @@ end
 mutable struct TextBox{T} <: GtkEntry
     handle::Ptr{GObject}
     obs::Observable
+    obsfunc
     T
 
     function TextBox(observable::Observable, T=String; kwargs...)
         entry = GtkEntry(; kwargs...)
 
         widget = new{T}(getfield(entry,:handle), observable)
 
-        on(observable; update=true) do val
+        widget.obsfunc = on(observable; update=true, weak=true) do val
             @idle_add Gtk4.G_.set_text(widget, string(val))
         end
 
@@ -88,6 +89,13 @@ function activated_cb_color(p::Ptr, propspec, obs::Observable{T}) where T
     nothing
 end
 
+function tooltip_query_cb(p::Ptr, x, y, keyboard_mode, tooltip_ptr, user_data)
+    b = convert(GtkColorDialogButton,p)
+    tooltip = convert(GtkTooltipLeaf, tooltip_ptr)
+    Gtk4.G_.set_text(tooltip, repr(b.obs[]))
+    return Int32(true)
+end
+
 _colorconv(s::Symbol) = parse(Colorant, s)
 _colorconv(s::AbstractString) = parse(Colorant, s)
 _colorconv(s) = s
@@ -100,6 +108,9 @@ mutable struct ColorButton{T} <: GtkColorDialogButton
         cb = GtkColorDialogButton(GtkColorDialog(); kwargs...)
         widget = new{T}(getfield(cb, :handle), observable)
 
+        Gtk4.on_query_tooltip(tooltip_query_cb, cb, nothing)
+        Gtk4.G_.set_has_tooltip(cb, true)
+
         on(observable; update=true) do val
             new_rgba = convert(GdkRGBA,_colorconv(val))
             if new_rgba != get_rgba(widget)