MCL/sf/mw/qt: comparison src/gui/widgets/qabstractslider.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 : minimum(0), maximum(99), singleStep(1), pageStep(10),
 value(0), position(0), pressValue(-1), offset_accumulated(0), tracking(true),
 blocktracking(false), pressed(false),
 invertedAppearance(false), invertedControls(false),
 orientation(Qt::Horizontal), repeatAction(QAbstractSlider::SliderNoAction)
+#ifdef QT_KEYPAD_NAVIGATION
+, isAutoRepeating(false)
+, repeatMultiplier(1)
+#endif
 {
 }
 QAbstractSliderPrivate::~QAbstractSliderPrivate()
 {
 \brief the single step.
 The smaller of two natural steps that an
 abstract sliders provides and typically corresponds to the user
 pressing an arrow key.
+If the property is modified during an auto repeating key event, behavior
+is undefined.
 \sa pageStep
 */
 void QAbstractSlider::setSingleStep(int step)
 {
 Q_D(QAbstractSlider);
 d->blocktracking = true;
 switch (action) {
 case SliderSingleStepAdd:
-setSliderPosition(d->overflowSafeAdd(d->singleStep));
+setSliderPosition(d->overflowSafeAdd(d->effectiveSingleStep()));
 break;
 case SliderSingleStepSub:
-setSliderPosition(d->overflowSafeAdd(-d->singleStep));
+setSliderPosition(d->overflowSafeAdd(-d->effectiveSingleStep()));
 break;
 case SliderPageStepAdd:
 setSliderPosition(d->overflowSafeAdd(d->pageStep));
 break;
 case SliderPageStepSub:
 #ifndef QT_NO_WHEELEVENT
 void QAbstractSlider::wheelEvent(QWheelEvent * e)
 {
 Q_D(QAbstractSlider);
 e->ignore();
-if (e->orientation() != d->orientation && !rect().contains(e->pos()))
-return;
+int stepsToScroll = 0;
+qreal offset = qreal(e->delta()) / 120;
-qreal currentOffset = qreal(e->delta()) / 120;
-d->offset_accumulated += currentOffset;
-if (int(d->offset_accumulated) == 0) {
-// QAbstractSlider works on integer values. So if the accumulated
-// offset is less than +/- 1, we need to wait until we get more
-// wheel events (this means that the wheel resolution is higher than
-// 15 degrees, e.g. when using mac mighty mouse/trackpad):
-return;
-}
-int stepsToScroll;
 if ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::ShiftModifier)) {
-stepsToScroll = currentOffset > 0 ? d->pageStep : -d->pageStep;
+// Scroll one page regardless of delta:
+stepsToScroll = qBound(-d->pageStep, int(offset * d->pageStep), d->pageStep);
+d->offset_accumulated = 0;
 } else {
-// Calculate the number of steps to scroll (per 15 degrees of rotate):
+// Calculate how many lines to scroll. Depending on what delta is (and
-#ifdef Q_OS_MAC
+// offset), we might end up with a fraction (e.g. scroll 1.3 lines). We can
-// On mac, since mouse wheel scrolling is accelerated and
+// only scroll whole lines, so we keep the reminder until next event.
-// fine tuned by the OS, we skip applying acceleration:
+qreal stepsToScrollF = offset * QApplication::wheelScrollLines() * d->effectiveSingleStep();
-stepsToScroll = int(d->offset_accumulated);
+// Check if wheel changed direction since last event:
-#else
+if (d->offset_accumulated != 0 && (offset / d->offset_accumulated) < 0)
-stepsToScroll = int(d->offset_accumulated) * QApplication::wheelScrollLines() * d->singleStep;
+d->offset_accumulated = 0;
-#endif
-stepsToScroll = qBound(-d->pageStep, stepsToScroll, d->pageStep);
+d->offset_accumulated += stepsToScrollF;
+stepsToScroll = qBound(-d->pageStep, int(d->offset_accumulated), d->pageStep);
+d->offset_accumulated -= int(d->offset_accumulated);
+if (stepsToScroll == 0)
+return;
 }
 if (d->invertedControls)
 stepsToScroll = -stepsToScroll;
 int prevValue = d->value;
 d->position = d->overflowSafeAdd(stepsToScroll); // value will be updated by triggerAction()
 triggerAction(SliderMove);
-if (prevValue == d->value) {
+if (prevValue == d->value)
 d->offset_accumulated = 0;
-} else {
+else
-d->offset_accumulated -= int(d->offset_accumulated);
 e->accept();
-}
 }
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
 /*!
 \internal
 */
 void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
 {
 Q_D(QAbstractSlider);
 SliderAction action = SliderNoAction;
+#ifdef QT_KEYPAD_NAVIGATION
+if (ev->isAutoRepeat()) {
+if (d->firstRepeat.isNull())
+d->firstRepeat = QTime::currentTime();
+else if (1 == d->repeatMultiplier) {
+// This is the interval in milli seconds which one key repetition
+// takes.
+const int repeatMSecs = d->firstRepeat.msecsTo(QTime::currentTime());
+/**
+* The time it takes to currently navigate the whole slider.
+*/
+const qreal currentTimeElapse = (qreal(maximum()) / singleStep()) * repeatMSecs;
+/**
+* This is an arbitrarily determined constant in msecs that
+* specifies how long time it should take to navigate from the
+* start to the end(excluding starting key auto repeat).
+*/
+const int SliderRepeatElapse = 2500;
+d->repeatMultiplier = currentTimeElapse / SliderRepeatElapse;
+}
+}
+else if (!d->firstRepeat.isNull()) {
+d->firstRepeat = QTime();
+d->repeatMultiplier = 1;
+}
+#endif
 switch (ev->key()) {
 #ifdef QT_KEYPAD_NAVIGATION
 case Qt::Key_Select:
 if (QApplication::keypadNavigationEnabled())
 setEditFocus(!hasEditFocus());

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7