Mercurial > octave

changeset 24178:857b553177a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix regression with axes lines layer (see bug #39692 comment #24) * gl-render.cc (opengl_renderer::draw_axes): allways draw axes lines right after grids
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Wed, 25 Oct 2017 23:22:59 +0200
parents 89167cc74260
children 8365e584ebd8
files libinterp/corefcn/gl-render.cc
diffstat 1 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc	Wed Sep 27 11:01:06 2017 -0500
+++ b/libinterp/corefcn/gl-render.cc	Wed Oct 25 23:22:59 2017 +0200
@@ -2119,10 +2119,11 @@
     draw_axes_planes (props);
 
     if (! is2D || props.layer_is ("bottom"))
-      draw_axes_grids (props);
-
-    if (props.get_tag () != "legend" || props.get_box () != "off")
-      draw_axes_boxes (props);
+      {
+        draw_axes_grids (props);
+        if (props.get_tag () != "legend" || props.get_box () != "off")
+          draw_axes_boxes (props);
+      }
 
     set_linestyle ("-");  // Disable LineStipple
 
@@ -2131,7 +2132,11 @@
     draw_axes_children (props);
 
     if (is2D && props.layer_is ("top"))
-      draw_axes_grids (props);
+      {
+        draw_axes_grids (props);
+        if (props.get_tag () != "legend" || props.get_box () != "off")
+          draw_axes_boxes (props);
+      }
 
 #else