Remove deprecated names

oops Move away from deprecated variable final
MakieOrg · Feb 4, 2024 · c05098c · c05098c
1 parent 9bcf4b7
commit c05098c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/GGThemr.jl b/src/GGThemr.jl
@@ -44,7 +44,7 @@ function style_ggthemr(basewidth = 2, spinewidth = basewidth * 0.75)
             zgridstyle = :dash,
         ),
         Legend = Attributes(
-            bgcolor = :transparent,
+            backgroundcolor = :transparent,
             framevisible = false,
         ),
         Scatter = Attributes(
@@ -61,7 +61,7 @@ function color_ggthemr(theme::Symbol)
         color = ct[:swatch][2:end],
         patchcolor = ct[:swatch][2:end],
       ),
-      Makie.default_palettes, 
+      Makie.DEFAULT_PALETTES, 
     )
 
     Attributes(

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -11,12 +11,14 @@ using AlgebraOfGraphics
   mkpath(joinpath(dirname(@__DIR__), "img", "demofigure"))
   mkpath(joinpath(dirname(@__DIR__), "img", "demoscatter"))
 
-  fig = MakieThemes.demofigure(Makie.minimal_default)
+  fig = MakieThemes.demofigure()
   save(joinpath(dirname(@__DIR__), "img", "demofigure", "default.png"), fig; px_per_unit = 2)
 
-  fig = MakieThemes.demoscatter(Makie.minimal_default)
+  fig = MakieThemes.demoscatter()
   save(joinpath(dirname(@__DIR__), "img", "demoscatter", "default.png"), fig; px_per_unit = 2)
 
+  old_theme = deepcopy(Makie.current_default_theme())
+
 
   for i in ggthemr_colorthemes()
     @test_nowarn begin
@@ -26,7 +28,7 @@ using AlgebraOfGraphics
         fig = MakieThemes.demoscatter(theme_ggthemr(i))
         save(joinpath(dirname(@__DIR__), "img", "demoscatter", "$i.png"), fig; px_per_unit = 2)
 
-        Makie.set_theme!(Makie.minimal_default)
+        Makie.set_theme!(old_theme)
     end
   end
   fig = MakieThemes.demofigure(theme_bbc())
@@ -36,7 +38,7 @@ using AlgebraOfGraphics
   fig = MakieThemes.demoscatter(theme_bbc())
   save(joinpath(dirname(@__DIR__), "img", "demoscatter", "bbc.png"), fig; px_per_unit = 2)
 
-  Makie.set_theme!(Makie.minimal_default)
+  Makie.set_theme!(old_theme)
 end
 
 @testset "GGthemr" begin
@@ -69,4 +71,4 @@ end
 
     end
   end
-end
+end