Unity API

Merge lp:~dandrader/unity-api/mouseWheel into lp:unity-api

  1. mouseWheel
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 195
Merged at revision: 199
Proposed branch: lp:~dandrader/unity-api/mouseWheel
Merge into: lp:unity-api
Diff against target: 48 lines (+14/-2)
3 files modified
debian/changelog (+7/-1)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirMousePointerInterface.h (+6/-0)
To merge this branch: bzr merge lp:~dandrader/unity-api/mouseWheel
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+278008@code.launchpad.net

Commit message

Added MirMousePointerInterface::handleWheelEvent

To post a comment you must log in.
lp:~dandrader/unity-api/mouseWheel updated
195. By Daniel d'Andrada

Added MirMousePointerInterface::handleWheelEvent

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/unity-api-ci/362/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/362/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, approving

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-11-02 11:23:43 +0000
3+++ debian/changelog 2015-11-19 14:28:28 +0000
4@@ -1,7 +1,13 @@
5+unity-api (7.103) UNRELEASED; urgency=medium
6+
7+ * Added MirMousePointerInterface::handleWheelEvent
8+
9+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Thu, 19 Nov 2015 11:30:52 -0200
10+
11 unity-api (7.102+16.04.20151102-0ubuntu1) xenial; urgency=medium
12
13 [ Nick Dedekind ]
14- * Added visibility to surface interface.
15+ * Added visibility to surface interface.
16
17 [ Michael Terry ]
18 * Add isTouchApp to ApplicationInfoInterface
19
20=== modified file 'include/unity/shell/application/CMakeLists.txt'
21--- include/unity/shell/application/CMakeLists.txt 2015-10-30 16:56:14 +0000
22+++ include/unity/shell/application/CMakeLists.txt 2015-11-19 14:28:28 +0000
23@@ -7,7 +7,7 @@
24
25 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
26
27-set(VERSION 10)
28+set(VERSION 11)
29 set(PKGCONFIG_NAME "unity-shell-application")
30 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
31 set(PKGCONFIG_REQUIRES "Qt5Core")
32
33=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
34--- include/unity/shell/application/MirMousePointerInterface.h 2015-10-13 20:17:39 +0000
35+++ include/unity/shell/application/MirMousePointerInterface.h 2015-11-19 14:28:28 +0000
36@@ -94,6 +94,12 @@
37 virtual void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
38 Qt::KeyboardModifiers modifiers) = 0;
39
40+ /**
41+ * @brief Handler for Mir mouse wheel events
42+ * This is called by Mir's platform cursor.
43+ */
44+ virtual void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) = 0;
45+
46 };
47
48 #endif // MIR_MOUSE_POINTER_INTERFACE_H

Subscribers

People subscribed via source and target branches

to all changes: