Mercurial > octave-antonio
diff libgui/graphics/Figure.cc @ 19977:5e6e0563388b
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 | 3cc0734283dc |
| children | c3a40003aa42 |
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: