# HG changeset patch
# User Rik <rik@octave.org>
# Date 1442940073 25200
# Node ID b6ae0ef9327e76d309858ccd344fb3c17cf16172
# Parent  afdb856e44f19c16322d6a81d6ef610c1b8fc787
Display bottom Qt statusbar on figure based on "toolbar" property (bug #46025).

* Figure.cc (Figure): Adjust bottom of window height (boffset) if m_statusBar
is visible.  Use m_statusBar->hide() to hide bottom status bar when "toolbar"
property is "none".

* Figure.cc (showFigureToolbar): Also show or hide m_statusBar widget based on
"toolbar" property.

diff -r afdb856e44f1 -r b6ae0ef9327e libgui/graphics/Figure.cc
--- a/libgui/graphics/Figure.cc	Tue Sep 22 05:45:05 2015 -0700
+++ b/libgui/graphics/Figure.cc	Tue Sep 22 09:41:13 2015 -0700
@@ -139,9 +139,7 @@
   
   // Status bar
   m_statusBar = win->statusBar ();
-  m_statusBar->setVisible (true);
-  int boffset = m_statusBar->sizeHint ().height ();
-  
+  int boffset = 0;
 
   // Toolbar and menubar
   createFigureToolBarAndMenuBar ();
@@ -150,9 +148,16 @@
   if (fp.toolbar_is ("figure") ||
       (fp.toolbar_is ("auto") && fp.menubar_is ("figure") &&
        ! hasUiControlChildren (fp)))
-    toffset += m_figureToolBar->sizeHint ().height ();
+    {
+      toffset += m_figureToolBar->sizeHint ().height ();
+      boffset += m_statusBar->sizeHint ().height ();
+    } 
   else
-    m_figureToolBar->hide ();
+    {
+      m_figureToolBar->hide ();
+      m_statusBar->hide ();
+    }
+
   if (fp.menubar_is ("figure") || hasUiMenuChildren (fp))
     toffset += m_menuBar->sizeHint ().height () + 1;
   else
@@ -502,17 +507,19 @@
 {
   if ((! m_figureToolBar->isHidden ()) != visible)
     {
-      int dy = m_figureToolBar->sizeHint ().height ();
+      int dy1 = m_figureToolBar->sizeHint ().height ();
+      int dy2 = m_statusBar->sizeHint ().height ();
       QRect r = qWidget<QWidget> ()->geometry ();
 
       if (! visible)
-        r.adjust (0, dy, 0, 0);
+        r.adjust (0, dy1, 0, -dy2);
       else
-        r.adjust (0, -dy, 0, 0);
+        r.adjust (0, -dy1, 0, dy2);
 
       m_blockUpdates = true;
       qWidget<QWidget> ()->setGeometry (r);
       m_figureToolBar->setVisible (visible);
+      m_statusBar->setVisible (visible);
       m_blockUpdates = false;
 
       updateBoundingBox (false);