diff --git a/src/backends/gr.jl b/src/backends/gr.jl index b27c7e39..15c3c7b0 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -565,11 +565,10 @@ gr_view_xcenter(viewport_plotarea) = 0.5 * (viewport_plotarea[1] + viewport_plot gr_view_ycenter(viewport_plotarea) = 0.5 * (viewport_plotarea[3] + viewport_plotarea[4]) function gr_legend_pos(sp::Subplot, w, h, viewport_plotarea) + legend_leftw, legend_rightw, legend_textw, x_legend_offset, y_legend_offset = w s = sp[:legend] typeof(s) <: Symbol || return gr_legend_pos(s, w, h, viewport_plotarea) str = string(s) - x_legend_offset = (viewport_plotarea[2] - viewport_plotarea[1]) / 30 - y_legend_offset = (viewport_plotarea[4] - viewport_plotarea[3]) / 15 if str == "best" str = "topright" end @@ -581,18 +580,18 @@ function gr_legend_pos(sp::Subplot, w, h, viewport_plotarea) if occursin("right", str) if occursin("outer", str) # As per https://github.com/jheinen/GR.jl/blob/master/src/jlgr.jl#L525 - xpos = viewport_plotarea[2] + 0.11 + ymirror * gr_axis_width(sp, sp[:yaxis]) + xpos = viewport_plotarea[2] + x_legend_offset + legend_leftw + ymirror * gr_axis_width(sp, sp[:yaxis]) else - xpos = viewport_plotarea[2] - x_legend_offset - w + xpos = viewport_plotarea[2] - legend_rightw - legend_textw end elseif occursin("left", str) if occursin("outer", str) - xpos = viewport_plotarea[1] - 0.05 - w - !ymirror * gr_axis_width(sp, sp[:yaxis]) + xpos = viewport_plotarea[1] - !ymirror * gr_axis_width(sp, sp[:yaxis]) - x_legend_offset * 2 - legend_rightw - legend_textw else - xpos = viewport_plotarea[1] + 0.08 + x_legend_offset + xpos = viewport_plotarea[1] + legend_leftw + x_legend_offset end else - xpos = (viewport_plotarea[2]-viewport_plotarea[1])/2 - w/2 + 0.04 + viewport_plotarea[1] + xpos = (viewport_plotarea[2]-viewport_plotarea[1])/2 + viewport_plotarea[1] + legend_leftw - legend_rightw - legend_textw - x_legend_offset * 2 end if occursin("top", str) if s == :outertop @@ -1002,22 +1001,29 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) legendn += 1 lab = series[:label] tbx, tby = gr_inqtext(0, 0, string(lab)) - legendw = max(legendw, tbx[3] - tbx[1]) + legendw = max(legendw, tbx[3] - tbx[1]) # Holds text width right now end GR.setscale(1) GR.selntran(1) GR.restorestate() end + legend_textw = legendw + legend_rightw = 0.02 # To be made dynamic in a follow up PR + legend_leftw = 0.08 # To be made dynamic in a follow up PR + total_legendw = legend_textw + legend_leftw + legend_rightw + + x_legend_offset = (viewport_plotarea[2] - viewport_plotarea[1]) / 30 + y_legend_offset = (viewport_plotarea[4] - viewport_plotarea[3]) / 15 dy = gr_point_mult(sp) * sp[:legendfontsize] * 1.75 legendh = dy * legendn leg_str = string(sp[:legend]) if occursin("outer", leg_str) if occursin("right", leg_str) - viewport_plotarea[2] -= legendw + 0.12 + viewport_plotarea[2] -= total_legendw + x_legend_offset # Lessen plot max width to make space for outer legend elseif occursin("left", leg_str) - viewport_plotarea[1] += legendw + 0.11 + viewport_plotarea[1] += total_legendw + x_legend_offset # Increase plot min width to make space for outer legend elseif occursin("top", leg_str) viewport_plotarea[4] -= legendh + 0.03 elseif occursin("bottom", leg_str) @@ -1839,17 +1845,17 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) GR.selntran(0) GR.setscale(0) gr_set_font(legendfont(sp), sp) - w = legendw + w = legendw # This is the legend text width n = legendn if w > 0 dy = gr_point_mult(sp) * sp[:legendfontsize] * 1.75 h = dy*n - xpos, ypos = gr_legend_pos(sp, w, h, viewport_plotarea) + xpos, ypos = gr_legend_pos(sp, [legend_leftw, legend_rightw, legend_textw, x_legend_offset, y_legend_offset], h, viewport_plotarea) # Passing legend width components instead of legend text width GR.setfillintstyle(GR.INTSTYLE_SOLID) gr_set_fillcolor(sp[:background_color_legend]) - GR.fillrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n) + GR.fillrect(xpos - legend_leftw, xpos + legend_textw + legend_rightw, ypos + dy, ypos - dy * n) # Allocating white space for actual legend width here gr_set_line(1, :solid, sp[:foreground_color_legend], sp) - GR.drawrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n) + GR.drawrect(xpos - legend_leftw, xpos + legend_textw + legend_rightw, ypos + dy, ypos - dy * n) # Drawing actual legend width here i = 0 if sp[:legendtitle] !== nothing GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_HALF)