mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1295 from wkearn/font_bugfix

Browse Source 
Use the :fontsize keys so the scalefontsizes command works
This commit is contained in:
Daniel Schwabeneder 2017-12-08 09:52:17 +01:00 committed by GitHub
commit ab490b8f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/args.jl
View File

@ -419,10 +419,10 @@ const _all_defaults = KW[
const _initial_defaults = deepcopy(_all_defaults) const _initial_defaults = deepcopy(_all_defaults)
# to be able to reset font sizes to initial values # to be able to reset font sizes to initial values
const _initial_fontsizes = Dict(:titlefont => _subplot_defaults[:titlefontsize], const _initial_fontsizes = Dict(:titlefontsize => _subplot_defaults[:titlefontsize],
:legendfont => _subplot_defaults[:legendfontsize], :legendfontsize => _subplot_defaults[:legendfontsize],
:tickfont => _axis_defaults[:tickfontsize], :tickfontsize => _axis_defaults[:tickfontsize],
:guidefont => _axis_defaults[:guidefontsize]) :guidefontsize => _axis_defaults[:guidefontsize])
const _all_args = sort(collect(union(map(keys, _all_defaults)...))) const _all_args = sort(collect(union(map(keys, _all_defaults)...)))

8
src/components.jl
View File

@ -305,7 +305,7 @@ end
function scalefontsize(k::Symbol, factor::Number) function scalefontsize(k::Symbol, factor::Number)
f = default(k) f = default(k)
f.pointsize = round(Int, factor * f.pointsize) f = round(Int, factor * f)
default(k, f) default(k, f)
end end
@ -315,7 +315,7 @@ end
Scales all **current** font sizes by `factor`. For example `scalefontsizes(1.1)` increases all current font sizes by 10%. To reset to initial sizes, use `scalefontsizes()` Scales all **current** font sizes by `factor`. For example `scalefontsizes(1.1)` increases all current font sizes by 10%. To reset to initial sizes, use `scalefontsizes()`
""" """
function scalefontsizes(factor::Number) function scalefontsizes(factor::Number)
for k in (:titlefont, :guidefont, :tickfont, :legendfont) for k in (:titlefontsize, :guidefontsize, :tickfontsize, :legendfontsize)
scalefontsize(k, factor) scalefontsize(k, factor)
end end
end end
@ -326,10 +326,10 @@ end
Resets font sizes to initial default values. Resets font sizes to initial default values.
""" """
function scalefontsizes() function scalefontsizes()
for k in (:titlefont, :guidefont, :tickfont, :legendfont) for k in (:titlefontsize, :guidefontsize, :tickfontsize, :legendfontsize)
f = default(k) f = default(k)
if k in keys(_initial_fontsizes) if k in keys(_initial_fontsizes)
factor = f.pointsize / _initial_fontsizes[k] factor = f / _initial_fontsizes[k]
scalefontsize(k, 1.0/factor) scalefontsize(k, 1.0/factor)
end end
end end