AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Code style fix"

Browse Source 
This reverts commit e1d7df5ce9.

The offending patch removed handling of page-up and page-down
shortcuts in QScrollView (including subclasses like QTextBrowser).

Pick-to: 6.2
Fixes: QTBUG-97908
Fixes: QTBUG-90352
Change-Id: If760e983a082edb53e12e1311e2c7f2676d80bb2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Richard Moe Gustavsen 2021-11-02 09:02:45 +01:00
parent f04dbdfc97
commit 8ba3a2f911
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/widgets/qabstractscrollarea.cpp
View File

@ -1232,7 +1232,14 @@ void QAbstractScrollArea::contextMenuEvent(QContextMenuEvent *e)
void QAbstractScrollArea::keyPressEvent(QKeyEvent * e)
{
Q_D(QAbstractScrollArea);
if (false){
#ifndef QT_NO_SHORTCUT
} else if (e == QKeySequence::MoveToPreviousPage) {
d->vbar->triggerAction(QScrollBar::SliderPageStepSub);
} else if (e == QKeySequence::MoveToNextPage) {
d->vbar->triggerAction(QScrollBar::SliderPageStepAdd);
#endif
} else {
#ifdef QT_KEYPAD_NAVIGATION
if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
e->ignore();
@ -1276,6 +1283,7 @@ void QAbstractScrollArea::keyPressEvent(QKeyEvent * e)
e->ignore();
return;
}
}
e->accept();
}