Fixed behaviour of mouse clicks for menu bars on Windows

As the behaviour described in the style hint seems to
be default and working, it can be removed.

Change-Id: Ia8d47cf187597ae48b9e42c3f98ef3d4c390db34
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oliver Wolff 2012-09-03 14:34:15 +02:00 committed by Qt by Nokia
parent e28a957035
commit d6d8ccd2d8
4 changed files with 0 additions and 14 deletions

View File

@ -4726,10 +4726,6 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
ret = Qt::StrongFocus;
break;
case SH_MenuBar_DismissOnSecondClick:
ret = 1;
break;
case SH_MessageBox_UseBorderForButtonSpacing:
ret = 0;
break;

View File

@ -1791,11 +1791,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SH_CustomBase Base value for custom style hints.
Custom values must be greater than this value.
\value SH_MenuBar_DismissOnSecondClick A boolean indicating if a menu in
the menu bar should be dismissed when it is clicked on a second time. (Example:
Clicking and releasing on the File Menu in a menu bar and then
immediately clicking on the File Menu again.)
\value SH_MessageBox_UseBorderForButtonSpacing A boolean indicating what the to
use the border of the buttons (computed as half the button height) for the spacing
of the button in a message box.

View File

@ -651,7 +651,6 @@ public:
SH_DrawMenuBarSeparator,
SH_TitleBar_ModifyNotification,
SH_Button_FocusPolicy,
SH_MenuBar_DismissOnSecondClick,
SH_MessageBox_UseBorderForButtonSpacing,
SH_TitleBar_AutoRaise,
SH_ToolButton_PopupDelay,

View File

@ -1079,10 +1079,6 @@ void QMenuBar::mousePressEvent(QMouseEvent *e)
d->activeMenu = 0;
menu->hide();
}
#ifdef Q_OS_WIN
if((d->closePopupMode = style()->styleHint(QStyle::SH_MenuBar_DismissOnSecondClick)))
update(d->actionRect(action));
#endif
} else {
d->setCurrentAction(action, true);
}