Mercurial > octave
changeset 21644:7bdfa98a98a3
maint: Periodic merge of stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 25 Apr 2016 08:07:36 -0700 |
parents | da9c75ffd1a3 (current diff) 9191c24fb329 (diff) |
children | 9810e483b42f |
files | libgui/graphics/Canvas.cc libinterp/dldfcn/__init_fltk__.cc |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc Sun Apr 24 23:15:57 2016 +1000 +++ b/libgui/graphics/Canvas.cc Mon Apr 25 08:07:36 2016 -0700 @@ -599,7 +599,9 @@ if (axesObj) { - if (axesObj.get_properties ().handlevisibility_is ("on")) + if (axesObj.get_properties ().handlevisibility_is ("on") + && axesObj.get_properties ().get_tag () != "legend" + && axesObj.get_properties ().get_tag () != "colorbar") Utils::properties<figure> (figObj) .set_currentaxes (axesObj.get_handle ().as_octave_value ()); if (! currentObj)
--- a/libinterp/dldfcn/__init_fltk__.cc Sun Apr 24 23:15:57 2016 +1000 +++ b/libinterp/dldfcn/__init_fltk__.cc Mon Apr 25 08:07:36 2016 -0700 @@ -1085,7 +1085,9 @@ void set_on_ax_obj (const std::string& name, const std::string& value) { // ax_obj is the last clicked axes object - if (ax_obj && ax_obj.isa ("axes")) + if (ax_obj && ax_obj.isa ("axes") + && ax_obj.get_properties ().get_tag () != "legend" + && ax_obj.get_properties ().get_tag () != "colorbar") { axes::properties& ap = dynamic_cast<axes::properties&>(ax_obj.get_properties ()); @@ -1265,7 +1267,8 @@ pos(1,2) = tmp(2); ap.set_currentpoint (pos); - fp.set_currentaxes (ap.get___myhandle__ ().value ()); + if (ap.get_tag () != "legend" && ap.get_tag () != "colorbar") + fp.set_currentaxes (ap.get___myhandle__ ().value ()); } }