Mercurial > jwe > octave
changeset 22721:0cd8a1c22f23
Let Qt menubar be restored after being hidden (bug #49529).
* Figure.cc (Figure::showMenubar): Remove if block preventing hidden menubar
from being restored. Remove leftover debug code.
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Thu, 03 Nov 2016 23:45:38 +0100 |
parents | 5654429b6d7e |
children | e6fac42c8d56 |
files | libgui/graphics/Figure.cc |
diffstat | 1 files changed, 11 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Thu Nov 03 10:35:03 2016 -0700 +++ b/libgui/graphics/Figure.cc Thu Nov 03 23:45:38 2016 +0100 @@ -545,25 +545,20 @@ if (! visible) visible = hasUiMenuChildren (properties<figure> ()); - if (! m_menuBar->isHidden ()) - { - int dy = qMax (h1, h2); - QRect r = qWidget<QWidget> ()->geometry (); + int dy = qMax (h1, h2); + QRect r = qWidget<QWidget> ()->geometry (); - //qDebug () << "Figure::showMenuBar:" << r; - if (! visible) - r.adjust (0, dy, 0, 0); - else - r.adjust (0, -dy, 0, 0); - //qDebug () << "Figure::showMenuBar(adjusted):" << r; + if (! visible) + r.adjust (0, dy, 0, 0); + else + r.adjust (0, -dy, 0, 0); - m_blockUpdates = true; - qWidget<QWidget> ()->setGeometry (r); - m_menuBar->setVisible (visible); - m_blockUpdates = false; + m_blockUpdates = true; + qWidget<QWidget> ()->setGeometry (r); + m_menuBar->setVisible (visible); + m_blockUpdates = false; - updateBoundingBox (false); - } + updateBoundingBox (false); } void