1
=== modified file 'debian/changelog'
2
--- debian/changelog	2017-02-17 14:12:04 +0000
3
+++ debian/changelog	2017-02-21 12:48:01 +0000
4
@@ -1,3 +1,9 @@
5
1
unity-api (8.4) UNRELEASED; urgency=medium
6
2
7
3
  * Added API needed for emulating touch out of mouse events at qtmir level
8
4
9
5
 -- Daniel d'Andrada <daniel.dandrada@canonical.com>  Thu, 09 Feb 2017 11:24:14 -0200
10
6
11
1
unity-api (8.3+17.04.20170217-0ubuntu1) zesty; urgency=medium
7
unity-api (8.3+17.04.20170217-0ubuntu1) zesty; urgency=medium
12
2
8
13
3
  [ Pete ]
9
  [ Pete ]
14
4
10
15
=== modified file 'include/unity/shell/application/CMakeLists.txt'
16
--- include/unity/shell/application/CMakeLists.txt	2017-01-26 11:07:35 +0000
17
+++ include/unity/shell/application/CMakeLists.txt	2017-02-21 12:48:01 +0000
18
@@ -7,7 +7,7 @@
19
7
7
20
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
21
9
9
23
10
set(VERSION 26)
10
set(VERSION 27)
24
11
set(PKGCONFIG_NAME "unity-shell-application")
11
set(PKGCONFIG_NAME "unity-shell-application")
25
12
set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
12
set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
26
13
set(PKGCONFIG_REQUIRES "Qt5Core")
13
set(PKGCONFIG_REQUIRES "Qt5Core")
27
14
14
28
=== modified file 'include/unity/shell/application/Mir.h'
29
--- include/unity/shell/application/Mir.h	2017-01-16 10:54:30 +0000
30
+++ include/unity/shell/application/Mir.h	2017-02-21 12:48:01 +0000
31
@@ -1,5 +1,5 @@
32
1
/*
1
/*
34
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
2
 * Copyright (C) 2015-2017 Canonical, Ltd.
35
3
 *
3
 *
36
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
37
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
38
@@ -20,7 +20,7 @@
39
20
#include <QObject>
20
#include <QObject>
40
21
21
41
22
/**
22
/**
43
23
    @brief Acting mostly as a namespace to hold enums and such for use in QML
23
    @brief Hold enums and global properties for use in QML
44
24
 */
24
 */
45
25
class Mir : public QObject
25
class Mir : public QObject
46
26
{
26
{
47
@@ -40,6 +40,16 @@
48
40
      */
40
      */
49
41
    Q_PROPERTY(QString currentKeymap READ currentKeymap WRITE setCurrentKeymap NOTIFY currentKeymapChanged)
41
    Q_PROPERTY(QString currentKeymap READ currentKeymap WRITE setCurrentKeymap NOTIFY currentKeymapChanged)
50
42
42
51
43
    /**
52
44
      * @brief Whether mir pointer events should generate QTouchEvents instead of QMouseEvents
53
45
      *
54
46
      * If true, mir pointer events will be used to synthesize QTouchEvents instead of being translated
55
47
      * into QMouseEvents.
56
48
      *
57
49
      * This is useful when testing touch UIs with a mouse device.
58
50
      */
59
51
    Q_PROPERTY(bool touchEmulationEnabled READ touchEmulationEnabled WRITE setTouchEmulationEnabled NOTIFY touchEmulationEnabledChanged)
60
52
61
43
public:
53
public:
62
44
    /**
54
    /**
63
45
        @brief Surface type
55
        @brief Surface type
64
@@ -118,12 +128,16 @@
65
118
128
66
119
    virtual QString currentKeymap() const = 0;
129
    virtual QString currentKeymap() const = 0;
67
120
    virtual void setCurrentKeymap(const QString &currentKeymap) = 0;
130
    virtual void setCurrentKeymap(const QString &currentKeymap) = 0;
68
131
69
132
    virtual bool touchEmulationEnabled() const = 0;
70
133
    virtual void setTouchEmulationEnabled(bool enabled) = 0;
71
121
    /// @endcond
134
    /// @endcond
72
122
135
73
123
Q_SIGNALS:
136
Q_SIGNALS:
74
124
    /// @cond
137
    /// @cond
75
125
    void cursorNameChanged(const QString &cursorName);
138
    void cursorNameChanged(const QString &cursorName);
76
126
    void currentKeymapChanged(const QString &currentKeymap);
139
    void currentKeymapChanged(const QString &currentKeymap);
77
140
    void touchEmulationEnabledChanged(bool enabled);
78
127
    /// @endcond
141
    /// @endcond
79
128
};
142
};
80
129
143
81
130
144
82
=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
83
--- include/unity/shell/application/MirMousePointerInterface.h	2016-05-18 20:51:23 +0000
84
+++ include/unity/shell/application/MirMousePointerInterface.h	2017-02-21 12:48:01 +0000
85
@@ -78,13 +78,16 @@
86
78
     * area.
78
     * area.
87
79
     * This is called by Mir's platform cursor.
79
     * This is called by Mir's platform cursor.
88
80
     *
80
     *
92
81
     * Note that we get only relative mouse movement, since the mouse pointer position is defined
81
     * The mouse pointer position is defined by this very item. Ie., it's up to this class to
93
82
     * by this very item. Ie., it's up to this class to decide whether or not it (the mouse pointer)
82
     * decide whether or not it (the mouse pointer) should move (and how much) due to movement
94
83
     * should move (and how much) due to movement in a mouse device.
83
     * in a mouse device.
95
84
     *
84
     *
96
85
     * @param movement Movement vector
85
     * @param movement Movement vector
97
86
     * @param position Position of the mouse device. Note that this is different from the
98
87
     *                 position of the mouse pointer defined by this class, which is what shell
99
88
     *                 will see and use.
100
86
     */
89
     */
102
87
    virtual void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
90
    virtual void handleMouseEvent(ulong timestamp, QPointF movement, QPointF position, Qt::MouseButtons buttons,
103
88
            Qt::KeyboardModifiers modifiers) = 0;
91
            Qt::KeyboardModifiers modifiers) = 0;
104
89
92
105
90
    /**
93
    /**
Status:	Needs review
Proposed branch:	lp:~dandrader/unity-api/mirInputTweaks
Merge into:	lp:unity-api
Diff against target:	105 lines (+30/-7) 4 files modified debian/changelog (+6/-0) include/unity/shell/application/CMakeLists.txt (+1/-1) include/unity/shell/application/Mir.h (+16/-2) include/unity/shell/application/MirMousePointerInterface.h (+7/-4)
To merge this branch:	bzr merge lp:~dandrader/unity-api/mirInputTweaks
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-02-21
Gerry Boland (community)		2017-02-09	Needs Information on 2017-02-09
Review via email: mp+316844@code.launchpad.net