Mercurial > octave

changeset 22528:5a1167e15c0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix color of (minor) grid (bug #48429). * gl-render.cc (draw_axis_[xyz]_grid): Use manually set axis color when (minor)gridcolormode is "auto".
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 22 Sep 2016 16:55:26 +0200
parents 42f32e515908
children 640c1b476860
files libinterp/corefcn/gl-render.cc
diffstat 1 files changed, 27 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc	Thu Sep 22 11:18:25 2016 +0200
+++ b/libinterp/corefcn/gl-render.cc	Thu Sep 22 16:55:26 2016 +0200
@@ -1383,6 +1383,15 @@
         bool tick_along_z = nearhoriz || octave::math::isinf (fy);
         bool mirror = props.is_box () && xstate != AXE_ANY_DIR;
 
+        if (props.xcolormode_is ("manual"))
+          {
+            // use axis color for (minor)gridcolor
+            if (props.gridcolormode_is ("auto"))
+              gridcolor = props.get_xcolor_rgb ();
+            if (props.minorgridcolormode_is ("auto"))
+              minorgridcolor = props.get_xcolor_rgb ();
+          }
+
         // set styles when drawing only minor grid
         if (do_xminorgrid && ! do_xgrid)
           {
@@ -1512,6 +1521,15 @@
         bool mirror = props.is_box () && ystate != AXE_ANY_DIR
                       && (! props.has_property ("__plotyy_axes__"));
 
+        if (props.ycolormode_is ("manual"))
+          {
+            // use axis color for (minor)gridcolor
+            if (props.gridcolormode_is ("auto"))
+              gridcolor = props.get_ycolor_rgb ();
+            if (props.minorgridcolormode_is ("auto"))
+              minorgridcolor = props.get_ycolor_rgb ();
+          }
+
         // set styles when drawing only minor grid
         if (do_yminorgrid && ! do_ygrid)
           {
@@ -1629,6 +1647,15 @@
         int hmax = 0;
         bool mirror = props.is_box () && zstate != AXE_ANY_DIR;
 
+        if (props.zcolormode_is ("manual"))
+          {
+            // use axis color for (minor)gridcolor
+            if (props.gridcolormode_is ("auto"))
+              gridcolor = props.get_zcolor_rgb ();
+            if (props.minorgridcolormode_is ("auto"))
+              minorgridcolor = props.get_zcolor_rgb ();
+          }
+
         // set styles when drawing only minor grid
         if (do_zminorgrid && ! do_zgrid)
           {