From f690961af2435c84e041163ed6a2217e973d3933 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Thu, 2 Nov 2017 20:12:11 +0100 Subject: [PATCH 1/2] gr: use correct aspect ratio (fixes #1219) --- src/backends/gr.jl | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index ef539066..95dfcbde 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -412,6 +412,9 @@ function gr_viewport_from_bbox(sp::Subplot{GRBackend}, bb::BoundingBox, w, h, vi viewport[3] = 0.5 * (vp[3] + vp[4] - extent) viewport[4] = 0.5 * (vp[3] + vp[4] + extent) end + if hascolorbar(sp) + viewport[2] -= (viewport[2] - viewport[1]) * 0.1 + end viewport end @@ -687,11 +690,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas) end end - if cmap - # note: add extra midpadding on the right for the colorbar - viewport_plotarea[2] -= 0.1 - end - # set our plot area view gr_set_viewport_plotarea() From b34f4141a2c25581aa248c702890b6cb62c89739 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Thu, 2 Nov 2017 21:53:11 +0100 Subject: [PATCH 2/2] Update gr.jl --- src/backends/gr.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 95dfcbde..359f2727 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -413,7 +413,7 @@ function gr_viewport_from_bbox(sp::Subplot{GRBackend}, bb::BoundingBox, w, h, vi viewport[4] = 0.5 * (vp[3] + vp[4] + extent) end if hascolorbar(sp) - viewport[2] -= (viewport[2] - viewport[1]) * 0.1 + viewport[2] -= 0.1 end viewport end