Unity API

Merge lp:~unity-team/unity-api/surfaceCursor into lp:unity-api

  1. surfaceCursor
  2. Merge into trunk
Proposed by Michał Sawicz on 2015-11-23
Status: Merged
Approved by: Michał Sawicz on 2015-11-23
Approved revision: 196
Merged at revision: 200
Proposed branch: lp:~unity-team/unity-api/surfaceCursor
Merge into: lp:unity-api
Prerequisite: lp:~dandrader/unity-api/mouseWheel
Diff against target: 36 lines (+12/-1) (has conflicts)
2 files modified
debian/changelog (+3/-1)
include/unity/shell/application/MirMousePointerInterface.h (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~unity-team/unity-api/surfaceCursor
Reviewer Review Type Date Requested Status
Michał Sawicz Approve on 2015-11-23
Lukáš Tinkl 2015-11-23 Pending
PS Jenkins bot continuous-integration 2015-11-23 Pending
Review via email: mp+278297@code.launchpad.net

This proposal supersedes a proposal from 2015-11-11.

Commit Message

Added MirMousePointerInterface::setCustomCursor

To post a comment you must log in.

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-23 10:13:50 +0000
3+++ debian/changelog 2015-11-23 10:13:50 +0000
4@@ -9,9 +9,11 @@
5 =======
6 unity-api (7.103) UNRELEASED; urgency=medium
7
8+ [ Daniel d'Andrada ]
9+ * Added MirMousePointerInterface::setCustomCursor
10 * Added MirMousePointerInterface::handleWheelEvent
11
12- -- Daniel d'Andrada <daniel.dandrada@canonical.com> Thu, 19 Nov 2015 11:30:52 -0200
13+ -- Michal Sawicz <michal.sawicz@canonical.com> Mon, 23 Nov 2015 11:12:50 +0100
14
15 >>>>>>> MERGE-SOURCE
16 unity-api (7.102+16.04.20151102-0ubuntu1) xenial; urgency=medium
17
18=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
19--- include/unity/shell/application/MirMousePointerInterface.h 2015-11-23 10:13:50 +0000
20+++ include/unity/shell/application/MirMousePointerInterface.h 2015-11-23 10:13:50 +0000
21@@ -70,6 +70,15 @@
22 virtual qreal hotspotY() const = 0;
23 /// @endcond
24
25+ /**
26+ * @brief Sets the custom cursor
27+ *
28+ * If it's not a pixmap cursor it will be ignored.
29+ *
30+ * To use it, cursorName must be set to "custom". themeName is ignored in this case.
31+ */
32+ virtual void setCustomCursor(const QCursor &) = 0;
33+
34 Q_SIGNALS:
35 /// @cond
36 void cursorNameChanged(QString name);

Subscribers

People subscribed via source and target branches

to all changes: