Skip to content

Commit c5538fe

Browse files
committed
revert to using Base.fill! again
1 parent 234a7a1 commit c5538fe

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

ext/GeoMakieExt.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using GeoMakie
44
using AxisKeysExtra
55

66
const MakieExt = Base.get_extension(AxisKeysExtra, :MakieExt)
7-
using .MakieExt: upd_axplt_attrs!, default_axis_attributes, default_plot_attributes
7+
using .MakieExt: default_axis_attributes, default_plot_attributes
88

99

1010
function Makie.plot!(ax::GeoAxis, plot::Union{
@@ -16,7 +16,7 @@ function Makie.plot!(ax::GeoAxis, plot::Union{
1616
attrs = (axis=default_axis_attributes(plot), plot=default_plot_attributes(plot))
1717
PT = typeof(plot)
1818
@invoke plot!(ax, plot::supertype(PT))
19-
upd_axplt_attrs!(ax, plot, attrs)
19+
Base.fill!(ax, plot, attrs) # pirate Base function for now, so that several packages can avoid depending on each other
2020
end
2121

2222
end

ext/MakieExt.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function Makie.plot!(ax::Makie.AbstractAxis, plot::Union{
8686
attrs = (axis=default_axis_attributes(plot), plot=default_plot_attributes(plot))
8787
PT = typeof(plot)
8888
@invoke plot!(ax, plot::supertype(PT))
89-
upd_axplt_attrs!(ax, plot, attrs)
89+
Base.fill!(ax, plot, attrs) # pirate Base function for now, so that several packages can avoid depending on each other
9090
end
9191

9292

@@ -166,7 +166,8 @@ end
166166
is_revrange(x::AbstractVector) = false
167167
is_revrange(x::AbstractRange) = step(x) < zero(step(x))
168168

169-
function upd_axplt_attrs!(ax::Makie.AbstractAxis, plot::Plot, attrs::NamedTuple)
169+
# pirate Base function for now, so that several packages can avoid depending on each other
170+
function Base.fill!(ax::Makie.AbstractAxis, plot::Plot, attrs::NamedTuple)
170171
for (k, v) in pairs(attrs.axis)
171172
upd_axplt_attr!(ax, k, v)
172173
end

0 commit comments

Comments
 (0)