# HG changeset patch
# User Pantxo Diribarne <pantxo.diribarne@gmail.com>
# Date 1427922184 -7200
# Node ID 08fae2e963fb4a1eb661b3c12fb2cf7462a8bed7
# Parent  b66ab1af5a3be999c0cab5857a4cd43ff557395a
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.

diff -r b66ab1af5a3b -r 08fae2e963fb libgui/graphics/Figure.cc
--- 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 ();