From 8e8a75051a4053d4b536a96e2d05f1f9ddf05ee4 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Mon, 24 Aug 2009 16:31:29 +0200 Subject: QMenuBar: some update Geometries missing This could lead to having wrong geometry on the mainwindow when a menubar is present. --- src/gui/widgets/qmenubar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 82b3769..0967f71 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -1695,6 +1695,7 @@ QSize QMenuBar::sizeHint() const ensurePolished(); QSize ret(0, 0); + const_cast(d)->updateGeometries(); const int hmargin = style()->pixelMetric(QStyle::PM_MenuBarHMargin, 0, this); const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this); int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this); @@ -1750,6 +1751,7 @@ int QMenuBar::heightForWidth(int) const const bool as_gui_menubar = true; #endif + const_cast(d)->updateGeometries(); int height = 0; const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this); int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this); -- cgit v0.12