Mercurial > octave-nkf

changeset 20012:5e6e0563388b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle "auto" value of figure "toolbar" property (bug #44573) * Figure.cc (Figure::update): when handling a change in "menubar" or "toolbar" property, take toolbar "auto" value into account.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Mon, 23 Mar 2015 09:03:39 +0100
parents f902855f870a
children 83dc1ab95429
files libgui/graphics/Figure.cc
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc	Sun Mar 22 16:18:27 2015 +0100
+++ b/libgui/graphics/Figure.cc	Mon Mar 23 09:03:39 2015 +0100
@@ -440,11 +440,14 @@
       else if (fp.toolbar_is ("figure"))
         showFigureToolBar (true);
       else // "auto"
-        showFigureToolBar (! hasUiControlChildren (fp));
+        showFigureToolBar (! hasUiControlChildren (fp) &&
+                           fp.menubar_is ("figure"));
       break;
 
     case figure::properties::ID_MENUBAR:
       showMenuBar (fp.menubar_is ("figure"));
+      if (fp.toolbar_is ("auto"))
+        showFigureToolBar (fp.menubar_is ("figure"));
       break;
 
     case figure::properties::ID_KEYPRESSFCN: