on xenial help sign in
Merge lp:~unity-team/unity8/mousePointer again
commit7de3ac1f1fc14adcadbf1d2def10edbf42cd0edc authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateThu 15 Oct 2015, 11:45 (11 years ago) parent8b85b4355ace57
3 files changed+2−21
plugins/Cursor/MousePointer.cpp+1−1 plugins/Cursor/MousePointer.h+1−1 tests/qmltests/Stages/tst_WindowResizeArea.qml−19
plugins/Cursor/MousePointer.cpp+1−1
@@ -34,7 +34,7 @@ MousePointer::MousePointer(QQuickItem *parent)
3434{
3535}
3636
37−void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButton buttons,
37+void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
3838 Qt::KeyboardModifiers modifiers)
3939{
4040 if (!parentItem()) {
plugins/Cursor/MousePointer.h+1−1
@@ -39,7 +39,7 @@ public:
3939 qreal hotspotY() const override { return m_hotspotY; }
4040
4141public Q_SLOTS:
42− void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButton buttons,
42+ void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
4343 Qt::KeyboardModifiers modifiers) override;
4444
4545protected:
tests/qmltests/Stages/tst_WindowResizeArea.qml−19
@@ -147,25 +147,6 @@ Item {
147147 compare(fakeWindow.y, Math.min(initialWindowY + data.dy, initialWindowY + maxMoveY));
148148 }
149149
150− function test_saveRestorePosition() {
151− var initialWindowX = fakeWindow.x;
152− var initialWindowY = fakeWindow.y;
153−
154− var moveDelta = units.gu(5);
155−
156− fakeWindow.x = initialWindowX + moveDelta
157− fakeWindow.y = initialWindowY + moveDelta
158−
159− // This will destroy the window and recreate it
160− windowLoader.active = false;
161− waitForRendering(root);
162− windowLoader.active = true;
163−
164− // Make sure it's again where we left it before destroying
165− tryCompare(fakeWindow, "x", initialWindowX + moveDelta)
166− tryCompare(fakeWindow, "y", initialWindowX + moveDelta)
167− }
168−
169150 function test_saveRestoreSize() {
170151 var initialWindowX = fakeWindow.x;
171152 var initialWindowY = fakeWindow.y;