diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-03-06 12:41:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 13:58:47 +0100 |
| commit | 813c39f3c4f7748e68e6e3473e3a7c6a34613ed3 (patch) | |
| tree | bbe8eb6794fbbcf897521142a17485d5efa33e0f /src/controls/qtmenu.cpp | |
| parent | 7b5aeb73a60d6c2747c2a592929ec96fd7d0ee80 (diff) | |
Menu: Fix warning when menu opens
Task-number: QTBUG-29862
Change-Id: I0a10aa103b1c4f5e0fba2e80eee7e07b6bc748fb
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/qtmenu.cpp')
| -rw-r--r-- | src/controls/qtmenu.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controls/qtmenu.cpp b/src/controls/qtmenu.cpp index 1b6c12ad4..d2c7e863e 100644 --- a/src/controls/qtmenu.cpp +++ b/src/controls/qtmenu.cpp @@ -265,7 +265,10 @@ void QtMenu::__popup(qreal x, qreal y, int atItemIndex) m_popupWindow->setItemAt(visualItem); } - m_popupWindow->setGeometry(x, y, m_menuContentItem->width(), m_menuContentItem->height()); + qreal initialWidth = qMax(qreal(1), m_menuContentItem->width()); + qreal initialHeight = qMax(qreal(1), m_menuContentItem->height()); + + m_popupWindow->setGeometry(x, y, initialWidth, initialHeight); m_popupWindow->show(); m_popupWindow->setMouseGrabEnabled(true); // Needs to be done after calling show() m_popupWindow->setKeyboardGrabEnabled(true); |