Unity 8

Merge lp:~dandrader/unity8/consecutiveCustomCursors into lp:unity8

consecutiveCustomCursors
Merge into trunk

Proposed by Daniel d'Andrada on 2016-06-06

Status:	Merged
Approved by:	Albert Astals Cid on 2016-06-07
Approved revision:	2442
Merged at revision:	2482
Proposed branch:	lp:~dandrader/unity8/consecutiveCustomCursors
Merge into:	lp:unity8
Diff against target:	12 lines (+1/-1) 1 file modified plugins/Cursor/CursorImageProvider.cpp (+1/-1)
To merge this branch:	bzr merge lp:~dandrader/unity8/consecutiveCustomCursors
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-07
Albert Astals Cid (community)		2016-06-06	Approve on 2016-06-06
Review via email: mp+296608@code.launchpad.net

Commit Message

Custom cursor name just have to start with "custom"

That way it's possible to change between consecutive custom
cursors as they will yield different image URLs

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/qtmir/consecutiveCustomCursors/+merge/296607

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.
To test:
$ bzr branch lp:~dandrader/+junk/animatedDemos
$ cd animatedDemos/CustomCursor
$ qmake && make
$ cd ..
$ qmlscene -I $PWD CursorShapes.qml --desktop_file_hint=SOME_EXISTING_FILE.desktop

Scroll to the bottom of the grid, where you will see a boat and a football. Move the cursor between those two cells and see the cursor shape change accordingly. Beware that if you do that many times you will eventually hit bug 1588929!

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

Albert Astals Cid (aacid) wrote on 2016-06-06:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Waiting for it to finish before top approving

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1420/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'plugins/Cursor/CursorImageProvider.cpp'
2	--- plugins/Cursor/CursorImageProvider.cpp 2016-05-19 19:44:37 +0000
3	+++ plugins/Cursor/CursorImageProvider.cpp 2016-06-06 20:46:54 +0000
4	@@ -300,7 +300,7 @@
5	{
6	if (cursorName == QLatin1String("blank")) {
7	return &m_blankCursorImage;
8	- } else if (cursorName == QLatin1String("custom")) {
9	+ } else if (cursorName.startsWith(QLatin1String("custom"))) {
10	return m_customCursorImage.data();
11	} else {
12	QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];