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

Code style fix

Browse Source 
Change-Id: I0174293421d866f3b124a9ff4344052749e8a1b9
Reviewed-by: Nie Cheng <niecheng@uniontech.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Nie Cheng 2020-08-20 10:28:14 +08:00
parent 1ff82d1eba
commit e1d7df5ce9
1 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1230,57 +1230,49 @@ 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();
return;
}
if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
e->ignore();
return;
}
#endif
switch (e->key()) {
case Qt::Key_Up:
d->vbar->triggerAction(QScrollBar::SliderSingleStepSub);
break;
case Qt::Key_Down:
d->vbar->triggerAction(QScrollBar::SliderSingleStepAdd);
break;
case Qt::Key_Left:
switch (e->key()) {
case Qt::Key_Up:
d->vbar->triggerAction(QScrollBar::SliderSingleStepSub);
break;
case Qt::Key_Down:
d->vbar->triggerAction(QScrollBar::SliderSingleStepAdd);
break;
case Qt::Key_Left:
#ifdef QT_KEYPAD_NAVIGATION
if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
&& (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) {
//if we aren't using the hbar or we are already at the leftmost point ignore
e->ignore();
return;
}
if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
&& (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) {
//if we aren't using the hbar or we are already at the leftmost point ignore
e->ignore();
return;
}
#endif
d->hbar->triggerAction(
layoutDirection() == Qt::LeftToRight
? QScrollBar::SliderSingleStepSub : QScrollBar::SliderSingleStepAdd);
break;
case Qt::Key_Right:
d->hbar->triggerAction(
layoutDirection() == Qt::LeftToRight
? QScrollBar::SliderSingleStepSub : QScrollBar::SliderSingleStepAdd);
break;
case Qt::Key_Right:
#ifdef QT_KEYPAD_NAVIGATION
if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
&& (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) {
//if we aren't using the hbar or we are already at the rightmost point ignore
e->ignore();
return;
}
if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
&& (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) {
//if we aren't using the hbar or we are already at the rightmost point ignore
e->ignore();
return;
}
#endif
d->hbar->triggerAction(
layoutDirection() == Qt::LeftToRight
? QScrollBar::SliderSingleStepAdd : QScrollBar::SliderSingleStepSub);
break;
default:
e->ignore();
return;
}
d->hbar->triggerAction(
layoutDirection() == Qt::LeftToRight
? QScrollBar::SliderSingleStepAdd : QScrollBar::SliderSingleStepSub);
break;
default:
e->ignore();
return;
}
e->accept();
}