Mercurial > octave-nkf
diff libgui/graphics/Figure.cc @ 20048:08fae2e963fb
Fix toolbar and menubar interaction at figure initialization (bug #44686)
* Figure.cc (Figure::Figure): when toolbar property is "auto", only show it if
the menubar is also shown.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Wed, 01 Apr 2015 23:03:04 +0200 |
| parents | 8d0860d5fd5a |
| children | 2d638e67aeef |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Wed Apr 01 16:14:25 2015 -0400 +++ b/libgui/graphics/Figure.cc Wed Apr 01 23:03:04 2015 +0200 @@ -129,8 +129,9 @@ createFigureToolBarAndMenuBar (); int offset = 0; - if (fp.toolbar_is ("figure") - || (fp.toolbar_is ("auto") && ! hasUiControlChildren (fp))) + if (fp.toolbar_is ("figure") || + (fp.toolbar_is ("auto") && fp.menubar_is ("figure") && + ! hasUiControlChildren (fp))) offset += m_figureToolBar->sizeHint ().height (); else m_figureToolBar->hide ();