1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.14' into dev"

Browse Source
This commit is contained in:
Qt Forward Merge Bot 2019-08-29 21:25:02 +02:00
commit 1a010d56e4
2 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/wayland/seatv4/tst_seatv4.cpp
View File

@ -212,22 +212,20 @@ void tst_seatv4::simpleAxis_data()
{ {
QTest::addColumn<uint>("axis"); QTest::addColumn<uint>("axis");
QTest::addColumn<qreal>("value"); QTest::addColumn<qreal>("value");
QTest::addColumn<Qt::Orientation>("orientation");
QTest::addColumn<QPoint>("angleDelta"); QTest::addColumn<QPoint>("angleDelta");
// Directions in regular windows/linux terms (no "natural" scrolling) // Directions in regular windows/linux terms (no "natural" scrolling)
QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << Qt::Vertical << QPoint{0, -12}; QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << QPoint{0, -12};
QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << Qt::Vertical << QPoint{0, 12}; QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << QPoint{0, 12};
QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << Qt::Horizontal << QPoint{-12, 0}; QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << QPoint{-12, 0};
QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << Qt::Horizontal << QPoint{12, 0}; QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << QPoint{12, 0};
QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << Qt::Vertical << QPoint{0, 120}; QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << QPoint{0, 120};
} }
void tst_seatv4::simpleAxis() void tst_seatv4::simpleAxis()
{ {
QFETCH(uint, axis); QFETCH(uint, axis);
QFETCH(qreal, value); QFETCH(qreal, value);
QFETCH(Qt::Orientation, orientation);
QFETCH(QPoint, angleDelta); QFETCH(QPoint, angleDelta);
class WheelWindow : QRasterWindow { class WheelWindow : QRasterWindow {
@ -256,27 +254,18 @@ void tst_seatv4::simpleAxis()
// We didn't press any buttons // We didn't press any buttons
QCOMPARE(event->buttons(), Qt::NoButton); QCOMPARE(event->buttons(), Qt::NoButton);
if (event->orientation() == Qt::Horizontal)
QCOMPARE(event->delta(), event->angleDelta().x());
else
QCOMPARE(event->delta(), event->angleDelta().y());
// There has been no information about what created the event. // There has been no information about what created the event.
// Documentation says not synthesized is appropriate in such cases // Documentation says not synthesized is appropriate in such cases
QCOMPARE(event->source(), Qt::MouseEventNotSynthesized); QCOMPARE(event->source(), Qt::MouseEventNotSynthesized);
m_events.append(Event(event->pixelDelta(), event->angleDelta(), event->orientation())); m_events.append(Event{event->pixelDelta(), event->angleDelta()});
} }
struct Event // Because I didn't find a convenient way to copy it entirely struct Event // Because I didn't find a convenient way to copy it entirely
{ {
// TODO: Constructors can be removed when we start supporting brace-initializers
Event() = default; Event() = default;
Event(const QPoint &pixelDelta, const QPoint &angleDelta, Qt::Orientation orientation)
: pixelDelta(pixelDelta), angleDelta(angleDelta), orientation(orientation)
{}
const QPoint pixelDelta; const QPoint pixelDelta;
const QPoint angleDelta; // eights of a degree, positive is upwards, left const QPoint angleDelta; // eights of a degree, positive is upwards, left
const Qt::Orientation orientation{};
}; };
QVector<Event> m_events; QVector<Event> m_events;
}; };
@ -299,7 +288,6 @@ void tst_seatv4::simpleAxis()
QTRY_COMPARE(window.m_events.size(), 1); QTRY_COMPARE(window.m_events.size(), 1);
auto event = window.m_events.takeFirst(); auto event = window.m_events.takeFirst();
QCOMPARE(event.angleDelta, angleDelta); QCOMPARE(event.angleDelta, angleDelta);
QCOMPARE(event.orientation, orientation);
} }
void tst_seatv4::invalidPointerEvents() void tst_seatv4::invalidPointerEvents()

36
tests/auto/wayland/seatv5/tst_seatv5.cpp
View File

@ -127,12 +127,8 @@ public:
QRasterWindow::wheelEvent(event); QRasterWindow::wheelEvent(event);
// qDebug() << event << "angleDelta" << event->angleDelta() << "pixelDelta" << event->pixelDelta(); // qDebug() << event << "angleDelta" << event->angleDelta() << "pixelDelta" << event->pixelDelta();
if (event->phase() == Qt::ScrollUpdate || event->phase() == Qt::NoScrollPhase) { if (event->phase() != Qt::ScrollUpdate && event->phase() != Qt::NoScrollPhase) {
// Angle delta should always be provided (says docs, but QPA sends compatibility events // Shouldn't have deltas in the these phases
// for Qt4 with zero angleDelta, and with a delta)
QVERIFY(!event->angleDelta().isNull() || event->delta());
} else {
// Shouldn't have deltas in the other phases
QCOMPARE(event->angleDelta(), QPoint(0, 0)); QCOMPARE(event->angleDelta(), QPoint(0, 0));
QCOMPARE(event->pixelDelta(), QPoint(0, 0)); QCOMPARE(event->pixelDelta(), QPoint(0, 0));
} }
@ -144,13 +140,6 @@ public:
// We didn't press any buttons // We didn't press any buttons
QCOMPARE(event->buttons(), Qt::NoButton); QCOMPARE(event->buttons(), Qt::NoButton);
if (!event->angleDelta().isNull()) {
if (event->orientation() == Qt::Horizontal)
QCOMPARE(event->delta(), event->angleDelta().x());
else
QCOMPARE(event->delta(), event->angleDelta().y());
}
m_events.append(Event{event}); m_events.append(Event{event});
} }
struct Event // Because I didn't find a convenient way to copy it entirely struct Event // Because I didn't find a convenient way to copy it entirely
@ -160,14 +149,12 @@ public:
: phase(event->phase()) : phase(event->phase())
, pixelDelta(event->pixelDelta()) , pixelDelta(event->pixelDelta())
, angleDelta(event->angleDelta()) , angleDelta(event->angleDelta())
, orientation(event->orientation())
, source(event->source()) , source(event->source())
{ {
} }
const Qt::ScrollPhase phase{}; const Qt::ScrollPhase phase{};
const QPoint pixelDelta; const QPoint pixelDelta;
const QPoint angleDelta; // eights of a degree, positive is upwards, left const QPoint angleDelta; // eights of a degree, positive is upwards, left
const Qt::Orientation orientation{};
const Qt::MouseEventSource source{}; const Qt::MouseEventSource source{};
}; };
QVector<Event> m_events; QVector<Event> m_events;
@ -177,22 +164,20 @@ void tst_seatv5::simpleAxis_data()
{ {
QTest::addColumn<uint>("axis"); QTest::addColumn<uint>("axis");
QTest::addColumn<qreal>("value"); QTest::addColumn<qreal>("value");
QTest::addColumn<Qt::Orientation>("orientation");
QTest::addColumn<QPoint>("angleDelta"); QTest::addColumn<QPoint>("angleDelta");
// Directions in regular windows/linux terms (no "natural" scrolling) // Directions in regular windows/linux terms (no "natural" scrolling)
QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << Qt::Vertical << QPoint{0, -12}; QTest::newRow("down") << uint(Pointer::axis_vertical_scroll) << 1.0 << QPoint{0, -12};
QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << Qt::Vertical << QPoint{0, 12}; QTest::newRow("up") << uint(Pointer::axis_vertical_scroll) << -1.0 << QPoint{0, 12};
QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << Qt::Horizontal << QPoint{-12, 0}; QTest::newRow("left") << uint(Pointer::axis_horizontal_scroll) << 1.0 << QPoint{-12, 0};
QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << Qt::Horizontal << QPoint{12, 0}; QTest::newRow("right") << uint(Pointer::axis_horizontal_scroll) << -1.0 << QPoint{12, 0};
QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << Qt::Vertical << QPoint{0, 120}; QTest::newRow("up big") << uint(Pointer::axis_vertical_scroll) << -10.0 << QPoint{0, 120};
} }
void tst_seatv5::simpleAxis() void tst_seatv5::simpleAxis()
{ {
QFETCH(uint, axis); QFETCH(uint, axis);
QFETCH(qreal, value); QFETCH(qreal, value);
QFETCH(Qt::Orientation, orientation);
QFETCH(QPoint, angleDelta); QFETCH(QPoint, angleDelta);
WheelWindow window; WheelWindow window;
@ -219,7 +204,6 @@ void tst_seatv5::simpleAxis()
// There has been no information about what created the event. // There has been no information about what created the event.
// Documentation says not synthesized is appropriate in such cases // Documentation says not synthesized is appropriate in such cases
QCOMPARE(e.source, Qt::MouseEventNotSynthesized); QCOMPARE(e.source, Qt::MouseEventNotSynthesized);
QCOMPARE(e.orientation, orientation);
QCOMPARE(e.angleDelta, angleDelta); QCOMPARE(e.angleDelta, angleDelta);
} }
@ -262,7 +246,7 @@ void tst_seatv5::fingerScroll()
{ {
auto e = window.m_events.takeFirst(); auto e = window.m_events.takeFirst();
QCOMPARE(e.phase, Qt::ScrollUpdate); QCOMPARE(e.phase, Qt::ScrollUpdate);
QCOMPARE(e.orientation, Qt::Vertical); QVERIFY(qAbs(e.angleDelta.x()) <= qAbs(e.angleDelta.y())); // Vertical scroll
// QCOMPARE(e.angleDelta, angleDelta); // TODO: what should this be? // QCOMPARE(e.angleDelta, angleDelta); // TODO: what should this be?
QCOMPARE(e.pixelDelta, QPoint(0, 10)); QCOMPARE(e.pixelDelta, QPoint(0, 10));
QCOMPARE(e.source, Qt::MouseEventSynthesizedBySystem); // A finger is not a wheel QCOMPARE(e.source, Qt::MouseEventSynthesizedBySystem); // A finger is not a wheel
@ -280,7 +264,7 @@ void tst_seatv5::fingerScroll()
{ {
auto e = window.m_events.takeFirst(); auto e = window.m_events.takeFirst();
QCOMPARE(e.phase, Qt::ScrollUpdate); QCOMPARE(e.phase, Qt::ScrollUpdate);
QCOMPARE(e.orientation, Qt::Horizontal); QVERIFY(qAbs(e.angleDelta.x()) > qAbs(e.angleDelta.y())); // Horizontal scroll
QCOMPARE(e.pixelDelta, QPoint(10, 0)); QCOMPARE(e.pixelDelta, QPoint(10, 0));
QCOMPARE(e.source, Qt::MouseEventSynthesizedBySystem); // A finger is not a wheel QCOMPARE(e.source, Qt::MouseEventSynthesizedBySystem); // A finger is not a wheel
} }
@ -372,7 +356,7 @@ void tst_seatv5::wheelDiscreteScroll()
{ {
auto e = window.m_events.takeFirst(); auto e = window.m_events.takeFirst();
QCOMPARE(e.phase, Qt::NoScrollPhase); QCOMPARE(e.phase, Qt::NoScrollPhase);
QCOMPARE(e.orientation, Qt::Vertical); QVERIFY(qAbs(e.angleDelta.x()) <= qAbs(e.angleDelta.y())); // Vertical scroll
// According to the docs the angle delta is in eights of a degree and most mice have // According to the docs the angle delta is in eights of a degree and most mice have
// 1 click = 15 degrees. The angle delta should therefore be: // 1 click = 15 degrees. The angle delta should therefore be:
// 15 degrees / (1/8 eights per degrees) = 120 eights of degrees. // 15 degrees / (1/8 eights per degrees) = 120 eights of degrees.