diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-24 14:31:29 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-24 14:32:44 (GMT) |
| commit | 8e8a75051a4053d4b536a96e2d05f1f9ddf05ee4 (patch) | |
| tree | 6dcc8cca7da0e61b521fe9615d919317df6bef87 /src/gui/widgets | |
| parent | 1f4f9d294af3edcec361c8d848fdb4fe6fbb1c45 (diff) | |
| download | Qt-8e8a75051a4053d4b536a96e2d05f1f9ddf05ee4.zip Qt-8e8a75051a4053d4b536a96e2d05f1f9ddf05ee4.tar.gz Qt-8e8a75051a4053d4b536a96e2d05f1f9ddf05ee4.tar.bz2 | |
QMenuBar: some update Geometries missing
This could lead to having wrong geometry on the mainwindow when a
menubar is present.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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<QMenuBarPrivate*>(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<QMenuBarPrivate*>(d)->updateGeometries(); int height = 0; const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this); int fw = style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, this); |