Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use MakieCore for core recipe functions #998

Closed
wants to merge 9 commits into from
Closed

use MakieCore for core recipe functions #998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0784384
use MakieCore for core functions
SimonDanisch May 27, 2021
8c27223
move more things to MakieCore
SimonDanisch May 28, 2021
86b728c
give recipes the same convert_argument treatment as scene plots
SimonDanisch May 28, 2021
1db6820
add MakieCore compat
SimonDanisch Jun 2, 2021
676cde8
Merge branch 'master' into sd/makiecore
SimonDanisch Jun 2, 2021
ff14dcc
Update Makie.jl
SimonDanisch Jun 2, 2021
24d9268
fix missing reference
SimonDanisch Jun 2, 2021
ce45c02
Merge branch 'sd/makiecore' of https://github.com/JuliaPlots/Makie.jl…
SimonDanisch Jun 2, 2021
31246f8
Merge branch 'master' into sd/makiecore
SimonDanisch Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix missing reference
  • Loading branch information
@SimonDanisch
SimonDanisch committed Jun 2, 2021
commit 24d92680207d55fc8d0d8267f6c52ad2fa98d5ae
3 changes: 1 addition & 2 deletions src/makielayout/layoutables/legend.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ function layoutable(::Type{Legend},
# above a 3d plot, but for now this hack is ok.
translate!(scene, (0, 0, 10))
end

onany(title, nbanks, titleposition, rowgap, colgap, patchlabelgap, groupgap, titlegap,
titlevisible, orientation, gridshalign, gridsvalign) do args...
relayout()
Expand Down Expand Up @@ -514,7 +513,7 @@ function layoutable(::Type{Legend}, fig_or_scene,
error("Number of elements not equal: $(length(titles)) titles, $(length(contentgroups)) content groups and $(length(labelgroups)) label groups.")
end


entrygroups = Node{Vector{EntryGroup}}([])
legend = layoutable(Legend, fig_or_scene, entrygroups; kwargs...)
entries = [[LegendEntry(l, pg, legend) for (l, pg) in zip(labelgroup, contentgroup)]
Expand Down
2 changes: 1 addition & 1 deletion src/units.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ basetype(::Type{<: Pixel}) = Pixel
"""
Millimeter on screen. This unit respects the dimension and pixel density of the screen
to represent millimeters on the screen. This is the must use unit for layouting,
that needs to look the same on all kind of screens. Similar as with the [`Pixel`](@ref) unit,
that needs to look the same on all kind of screens. Similar as with the `Pixel` unit,
a camera can change the actually displayed dimensions of any object using the millimeter unit.
"""
struct Millimeter{T} <: Unit{T}
Expand Down