Mercurial > hg > octave-nkf
changeset 20228:9c26eee65266
maint: Merge away accidental head.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 02 Apr 2015 13:28:41 -0400 |
parents | 4b7b7ac7af2c (current diff) 08fae2e963fb (diff) |
children | 002576bbba10 |
files | |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc +++ b/libgui/graphics/Figure.cc @@ -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 ();