diff options
| author | Andy Shaw <qt-info@nokia.com> | 2009-09-21 12:40:53 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2009-09-21 12:40:53 (GMT) |
| commit | 3bc60c59bf967425afb9b2ef891b5c701a4f1f86 (patch) | |
| tree | 9f2ea8e4fa6991482652a73b144b28f31346b3da /src/gui/widgets/qtoolbutton.cpp | |
| parent | e39d9914491c4a21f7c44140a26fc9bdff682b9d (diff) | |
| download | Qt-3bc60c59bf967425afb9b2ef891b5c701a4f1f86.zip Qt-3bc60c59bf967425afb9b2ef891b5c701a4f1f86.tar.gz Qt-3bc60c59bf967425afb9b2ef891b5c701a4f1f86.tar.bz2 | |
Ensure that the menu only shows when clicking on the menu button
In Qt 3 clicking on the toolbutton would not popup the menu, only when
clicking on the arrow for the menu popup would this appear if the
toolbutton had MenuPopup mode set.
When a Q3ActionGroup is used and added to a toolbar then it will give a
toolbutton with such a button. This patch fixes the behaviour so that
only clicking on the arrow button will cause the menu to appear in this
mode.
Reviewed-by: Thierry
Diffstat (limited to 'src/gui/widgets/qtoolbutton.cpp')
| -rw-r--r-- | src/gui/widgets/qtoolbutton.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 828cd77..91f366f 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -871,7 +871,9 @@ void QToolButtonPrivate::_q_buttonPressed() Q_Q(QToolButton); if (!hasMenu()) return; // no menu to show - if (delay > 0 && !popupTimer.isActive() && popupMode == QToolButton::DelayedPopup) + if (popupMode == QToolButton::MenuButtonPopup) + return; + else if (delay > 0 && !popupTimer.isActive() && popupMode == QToolButton::DelayedPopup) popupTimer.start(delay, q); else if (delay == 0 || popupMode == QToolButton::InstantPopup) q->showMenu(); |