b80c4c7 · unity8 · git.iko.soy

plugins/Ubuntu/Gestures/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -5,7 +5,7 @@ set(UbuntuGesturesQml_SOURCES

5 plugin.cpp

6 AxisVelocityCalculator.cpp

7 Direction.cpp

8− FloatingFlickableHelper.cpp

8+ MouseEventGenerator.cpp

9 PressedOutsideNotifier.cpp

10 TouchDispatcher.cpp

11 TouchGate.cpp

plugins/Ubuntu/Gestures/FloatingFlickableHelper.cppdeleted−59

@@ -1,59 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "FloatingFlickableHelper.h"

18−

19−#include <QCoreApplication>

20−#include <QMouseEvent>

21−#include <QQuickItem>

22−

23−FloatingFlickableHelper::FloatingFlickableHelper(QObject *parent)

24− : QObject(parent)

25− , m_mousePressed(false)

26−{

27−}

28−

29−void FloatingFlickableHelper::onDragAreaTouchPosChanged(QQuickItem *flickable, const QPointF touchPosition)

30−{

31− if (m_mousePressed) {

32− QMouseEvent mouseEvent(QEvent::MouseMove,

33− QPointF(touchPosition.x(), touchPosition.y()),

34− Qt::NoButton, Qt::LeftButton, Qt::NoModifier);

35−

36− QCoreApplication::sendEvent(flickable, &mouseEvent);

37−

38− }

39−}

40−

41−void FloatingFlickableHelper::onDragAreaDraggingChanged(QQuickItem *flickable, bool dragging, const QPointF touchPosition)

42−{

43− if (dragging && !m_mousePressed) {

44− QMouseEvent mouseEvent(QEvent::MouseButtonPress,

45− QPointF(touchPosition.x(), touchPosition.y()),

46− Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

47−

48− QCoreApplication::sendEvent(flickable, &mouseEvent);

49− m_mousePressed = true;

50−

51− } else if (!dragging && m_mousePressed) {

52− QMouseEvent mouseEvent(QEvent::MouseButtonRelease,

53− QPointF(touchPosition.x(), touchPosition.y()),

54− Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

55−

56− QCoreApplication::sendEvent(flickable, &mouseEvent);

57− m_mousePressed = false;

58− }

59−}

plugins/Ubuntu/Gestures/MouseEventGenerator.cppnew file+64

@@ -0,0 +1,64 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "MouseEventGenerator.h"

18+

19+#include <QCoreApplication>

20+#include <QMouseEvent>

21+#include <QQuickItem>

22+

23+MouseEventGenerator::MouseEventGenerator(QObject *parent)

24+ : QObject(parent)

25+{

26+}

27+

28+void MouseEventGenerator::move(const QPointF position)

29+{

30+ if (!m_mousePressed || !m_targetItem) {

31+ return;

32+ }

33+

34+ QMouseEvent mouseEvent(QEvent::MouseMove,

35+ QPointF(position.x(), position.y()), Qt::NoButton, Qt::LeftButton, Qt::NoModifier);

36+

37+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);

38+}

39+

40+void MouseEventGenerator::press(const QPointF position)

41+{

42+ if (m_mousePressed || !m_targetItem) {

43+ return;

44+ }

45+

46+ QMouseEvent mouseEvent(QEvent::MouseButtonPress,

47+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

48+

49+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);

50+ m_mousePressed = true;

51+}

52+

53+void MouseEventGenerator::release(const QPointF position)

54+{

55+ if (!m_mousePressed || !m_targetItem) {

56+ return;

57+ }

58+

59+ QMouseEvent mouseEvent(QEvent::MouseButtonRelease,

60+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

61+

62+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);

63+ m_mousePressed = false;

64+}

plugins/Ubuntu/Gestures/FloatingFlickableHelper.h → plugins/Ubuntu/Gestures/MouseEventGenerator.hrenamed+15−9

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -14,8 +14,8 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

16

17−#ifndef FLOATING_FLICKABLE_HELPER_H

17+#ifndef MOUSEEVENTGENERATOR_H

18−#define FLOATING_FLICKABLE_HELPER_H

18+#define MOUSEEVENTGENERATOR_H

19

20#include <QObject>

21#include <QPointF>

@@ -24,19 +24,25 @@

24

25class QQuickItem;

26

27−class UBUNTUGESTURESQML_EXPORT FloatingFlickableHelper : public QObject {

27+class UBUNTUGESTURESQML_EXPORT MouseEventGenerator : public QObject {

28 Q_OBJECT

29+ Q_PROPERTY(QQuickItem* targetItem MEMBER m_targetItem NOTIFY targetItemChanged)

29

30

30public:

31public:

31− FloatingFlickableHelper(QObject *parent = nullptr);

32+ MouseEventGenerator(QObject *parent = nullptr);

32

33

33− Q_INVOKABLE void onDragAreaTouchPosChanged(QQuickItem *flickable, const QPointF touchPosition);

34+ Q_INVOKABLE void move(const QPointF position);

34− Q_INVOKABLE void onDragAreaDraggingChanged(QQuickItem *flickable, bool dragging, const QPointF touchPosition);

35+ Q_INVOKABLE void press(const QPointF position);

36+ Q_INVOKABLE void release(const QPointF position);

37+

38+Q_SIGNALS:

39+ void targetItemChanged(QQuickItem *);

35

40

36private:

41private:

37− bool m_mousePressed;

42+ bool m_mousePressed {false};

43+ QQuickItem *m_targetItem {nullptr};

38

44

39 friend class tst_FloatingFlickable;

45 friend class tst_FloatingFlickable;

40};

46};

41

47

42−#endif

48+#endif // MOUSEEVENTGENERATOR_H

plugins/Ubuntu/Gestures/plugin.cpp+3−3

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -17,7 +17,7 @@

17#include "plugin.h"

18#include "AxisVelocityCalculator.h"

19#include "Direction.h"

20−#include "FloatingFlickableHelper.h"

20+#include "MouseEventGenerator.h"

21#include "PressedOutsideNotifier.h"

22#include "TouchGate.h"

23

@@ -33,7 +33,7 @@ void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)

33{

34 qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);

35 qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");

36− qmlRegisterType<FloatingFlickableHelper>(uri, 0, 1, "FloatingFlickableHelper");

36+ qmlRegisterType<MouseEventGenerator>(uri, 0, 1, "MouseEventGenerator");

37 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");

38 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");

39}

qml/Components/FloatingFlickable.qml+7−5

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -35,8 +35,9 @@ Item {

35 property alias contentY: flickable.contentY

36 property alias direction: swipeArea.direction

37

38− FloatingFlickableHelper {

38+ MouseEventGenerator {

39− id: ffh

39+ id: mouseEventGenerator

40+ targetItem: flickable

40 }

41 }

41

42

42 Flickable {

43 Flickable {

@@ -51,7 +52,8 @@ Item {

51 anchors.fill: parent

52 anchors.fill: parent

52 direction: Direction.Horizontal

53 direction: Direction.Horizontal

53

54

54− onTouchPositionChanged: ffh.onDragAreaTouchPosChanged(flickable, touchPosition);

55+ onTouchPositionChanged: mouseEventGenerator.move(touchPosition);

55− onDraggingChanged: ffh.onDragAreaDraggingChanged(flickable, dragging, touchPosition);

56+ onDraggingChanged: dragging ? mouseEventGenerator.press(touchPosition)

57+ : mouseEventGenerator.release(touchPosition)

56 }

58 }

57}

59}