From f4ed35c3b6207b59166ee2cd3a3a8cea831f0cf3 Mon Sep 17 00:00:00 2001
From: BerndR <20151553+bernd1995@users.noreply.github.com>
Date: Tue, 27 Jul 2021 13:03:46 +0200
Subject: [PATCH 1/2] Added colorbar font settings

---
 src/backends/gr.jl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/backends/gr.jl b/src/backends/gr.jl
index e179fef1..c7163f1b 100644
--- a/src/backends/gr.jl
+++ b/src/backends/gr.jl
@@ -559,11 +559,16 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims, viewport_plotare
     gr_set_line(1, :solid, plot_color(:black), sp)
     GR.axes(0, ztick, xmax, zmin, 0, 1, 0.005)
 
-    gr_set_font(guidefont(sp[:yaxis]), sp)
+    if isa(sp[:colorbar_title],PlotText)
+        title = sp[:colorbar_title]
+    else
+        title = text(sp[:colorbar_title], colorbartitlefont(sp))
+    end
+    gr_set_font(title.font, sp)
     GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
     GR.setcharup(-1, 0)
     gr_text(
-        viewport_plotarea[2] + 0.1, gr_view_ycenter(viewport_plotarea), sp[:colorbar_title]
+        viewport_plotarea[2] + 0.1, gr_view_ycenter(viewport_plotarea), title.str
     )
 
     GR.restorestate()
@@ -1902,7 +1907,7 @@ function gr_draw_surface(series, x, y, z, clims)
         gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series), series)
         GR.polyline3d(X, Y, Z)
     else
-        throw(ArgumentError("Not handled !"))    
+        throw(ArgumentError("Not handled !"))
     end
 end
 

From a0c939b7c7476d9aece463ab9bff89d7bbef288a Mon Sep 17 00:00:00 2001
From: t-bltg <13423344+t-bltg@users.noreply.github.com>
Date: Tue, 27 Jul 2021 20:42:29 +0200
Subject: [PATCH 2/2] Update gr.jl

---
 src/backends/gr.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backends/gr.jl b/src/backends/gr.jl
index c7163f1b..fe28fc4f 100644
--- a/src/backends/gr.jl
+++ b/src/backends/gr.jl
@@ -559,10 +559,10 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims, viewport_plotare
     gr_set_line(1, :solid, plot_color(:black), sp)
     GR.axes(0, ztick, xmax, zmin, 0, 1, 0.005)
 
-    if isa(sp[:colorbar_title],PlotText)
-        title = sp[:colorbar_title]
+    title = if isa(sp[:colorbar_title], PlotText)
+        sp[:colorbar_title]
     else
-        title = text(sp[:colorbar_title], colorbartitlefont(sp))
+        text(sp[:colorbar_title], colorbartitlefont(sp))
     end
     gr_set_font(title.font, sp)
     GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)