Mercurial > octave

diff libinterp/corefcn/gl-render.cc @ 22358:dc73bbd66363

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure all lines associated with axes respect axes linewidth property. * gl-render.cc (draw_axes_boxes): Remove call to set_linewidth. * gl-render.cc (draw_axes): Call set_linewidth before drawing axes, grid, and ticks. * gl-render.cc: Call set_linewidth (0.5f) since function expects a float input.
author Rik <rik@octave.org>
date Mon, 22 Aug 2016 13:47:50 -0700
parents 8f23b5b23235
children f3ce0015dd42
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc	Mon Aug 22 13:33:20 2016 +0200
+++ b/libinterp/corefcn/gl-render.cc	Mon Aug 22 13:47:50 2016 -0700
@@ -1195,7 +1195,6 @@
     // Axes box
 
     set_linestyle ("-", true);
-    set_linewidth (props.get_linewidth ());
 
     glBegin (GL_LINES);
 
@@ -1860,6 +1859,7 @@
 
     set_font (props);
     set_interpreter (props.get_ticklabelinterpreter ());
+    set_linewidth (props.get_linewidth ());
 
     // draw axes object
     draw_axes_planes (props);
@@ -1980,7 +1980,7 @@
               glEnd ();
           }
 
-        set_linewidth (0.5);
+        set_linewidth (0.5f);
         set_linestyle ("-");
       }
 
@@ -2548,7 +2548,7 @@
               }
 
             set_linestyle ("-");
-            set_linewidth (0.5);
+            set_linewidth (0.5f);
 
             if ((el_mode > 0) && (num_lights > 0))
               glDisable (GL_LIGHTING);
@@ -3018,7 +3018,7 @@
               }
 
             set_linestyle ("-");
-            set_linewidth (0.5);
+            set_linewidth (0.5f);
 
             if ((el_mode > 0) && (num_lights > 0) && has_normals)
               glDisable (GL_LIGHTING);