Mercurial > jwe > octave
changeset 20738:f90295782d60
Accept color value of "none" for line objects (bug #44224).
* gl-render.cc: Check color value and don't bother to draw line if value is
"none".
* graphics.in.h: Set default value of color property to be a union of a color
value and a radio value.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 23 Nov 2015 17:15:38 -0800 |
| parents | 1a329319975b |
| children | 9e8a6d6d6de9 |
| files | libinterp/corefcn/gl-render.cc libinterp/corefcn/graphics.in.h |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc Mon Nov 23 16:07:23 2015 +0000 +++ b/libinterp/corefcn/gl-render.cc Mon Nov 23 17:15:38 2015 -0800 @@ -1518,7 +1518,7 @@ clip[i] = (clip_code (x(i), y(i), z_mid) & clip_mask); } - if (! props.linestyle_is ("none")) + if (! props.linestyle_is ("none") && ! props.color_is ("none")) { set_color (props.get_color_rgb ()); set_linestyle (props.get_linestyle (), false);
--- a/libinterp/corefcn/graphics.in.h Mon Nov 23 16:07:23 2015 +0000 +++ b/libinterp/corefcn/graphics.in.h Mon Nov 23 17:15:38 2015 -0800 @@ -4411,7 +4411,7 @@ // Programming note: Keep property list sorted if new ones are added. BEGIN_PROPERTIES (line) - color_property color , color_values (0, 0, 0) + color_property color , color_property (color_values (0, 0, 0), radio_values ("none")) string_property displayname , "" radio_property erasemode , "{normal}|none|xor|background" // FIXME: interpreter is not a property of Matlab line objects.