# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1427995721 14400
# Node ID 9c26eee65266890e1fcc97e35204566160ec9ecf
# Parent  4b7b7ac7af2c0372acf6f89b3b0d4239174ee8ca# Parent  08fae2e963fb4a1eb661b3c12fb2cf7462a8bed7
maint: Merge away accidental head.

diff -r 4b7b7ac7af2c -r 9c26eee65266 libgui/graphics/Figure.cc
--- 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 ();