Mercurial > octave-nkf

changeset 20053:9c26eee65266

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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	Thu Apr 02 13:19:30 2015 -0400
+++ b/libgui/graphics/Figure.cc	Thu Apr 02 13:28:41 2015 -0400
@@ -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 ();