Merge lp:~dandrader/unity8/fallbackCursorNames into lp:unity8
| Status: | Merged |
|---|---|
| Approved by: | Lukáš Tinkl on 2015-11-18 |
| Approved revision: | 2039 |
| Merged at revision: | 2063 |
| Proposed branch: | lp:~dandrader/unity8/fallbackCursorNames |
| Merge into: | lp:unity8 |
| Diff against target: |
273 lines (+140/-17) 6 files modified
CMakeLists.txt (+1/-1) debian/control (+3/-3) plugins/Cursor/CursorImageProvider.cpp (+113/-13) plugins/Cursor/CursorImageProvider.h (+16/-0) plugins/Cursor/MousePointer.cpp (+5/-0) plugins/Cursor/MousePointer.h (+2/-0) |
| To merge this branch: | bzr merge lp:~dandrader/unity8/fallbackCursorNames |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | Abstain on 2015-11-23 | ||
| Lukáš Tinkl (community) | 2015-11-11 | Approve on 2015-11-18 | |
| PS Jenkins bot | continuous-integration | Needs Fixing on 2015-11-17 | |
|
Review via email:
|
|||
Commit Message
Cursor: Add more fallback names, a blank and custom cursor support
Description of the Change
For testing (assuming a laptop/desktop in the instructions below), use the following application:
$ bzr branch lp:~dandrader/+junk/animatedDemos
$ cd animatedDemos/
animatedDemos/
animatedDemos/
animatedDemos$ vim football.desktop (edit the Icon path appropriately)
animatedDemos$ unset QT_QPA_
animatedDemos$ export MIR_SOCKET=
animatedDemos$ export QT_QPA_
animatedDemos$ qmlscene -I . CursorShapes.qml --desktop_
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
https:/
https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, on a test laptop running a unity8-mir session.
* Did you make sure that your branch does not contain spurious tags?
Yes.
* 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
| Lukáš Tinkl (lukas-kde) wrote : | # |
QList<QString> -> QStringList (in various places)
| Lukáš Tinkl (lukas-kde) wrote : | # |
Now that we've got this client side cursor stuff in place, I'd like to see it used in WindowResizeAre
| Lukáš Tinkl (lukas-kde) wrote : | # |
There are still many more fallback names missing, looks like QtWayland has a more complete list:
| Daniel d'Andrada (dandrader) wrote : | # |
On 13/11/2015 12:05, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Now that we've got this client side cursor stuff in place, I'd like to see it used in WindowResizeAre
This is not related and that's not possible.
1 - WindowResizeArea not on client side.
2 - WindowResizeArea uses cursor names that have no counterpart in
Qt::CursorShape. That's the whole point for having Mir.cursorName in the
first place.
- 2038. By Daniel d'Andrada on 2015-11-16
-
s/QList<
QString> /QStringList
| Daniel d'Andrada (dandrader) wrote : | # |
On 13/11/2015 12:03, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> QList<QString> -> QStringList (in various places)
Done.
I only found "QMap<QString, QList<QString>> m_fallbackNames" though.
| Lukáš Tinkl (lukas-kde) wrote : | # |
> On 13/11/2015 12:05, Lukáš Tinkl wrote:
> > Review: Needs Fixing
> >
> > Now that we've got this client side cursor stuff in place, I'd like to see
> it used in WindowResizeAre
> its "cursorShape" properly).
>
> This is not related and that's not possible.
Ack, I see
- 2039. By Daniel d'Andrada on 2015-11-16
-
Extend fallback names
| Daniel d'Andrada (dandrader) wrote : | # |
On 13/11/2015 13:54, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> There are still many more fallback names missing, looks like QtWayland has a more complete list:
>
> http://
Would say more complete as for some items here and there we do diverge.
But they have more stuff indeed. Added the non-conflicting ones.
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2038
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2039
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2038
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
| Lukáš Tinkl (lukas-kde) wrote : | # |
The SizeAll and OpenHand cursors don't work for me (Qt::OpenHandCursor and Qt::SizeAllCursor), the rest is fine. Also, having tested this in a webbrowser, it works pretty fine.
| Daniel d'Andrada (dandrader) wrote : | # |
On 18/11/2015 17:46, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> The SizeAll and OpenHand cursors don't work for me (Qt::OpenHandCursor and Qt::SizeAllCursor), the rest is fine. Also, having tested this in a webbrowser, it works pretty fine.
Because DMZ theme doesn't have them. Providing cursors for all shapes is
beyond the scope of this patch.
This patch is solely about enabling client applications to set the
cursor shape.
| Lukáš Tinkl (lukas-kde) wrote : | # |
Approving, works fine (modulo the missing SizeAll and OpenHand cursors due to incomplete DMZ theme). However, as I could test this only with the default DMZ theme, filing a bug report about broken non-default theme loading.
* 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.
No, incompatible unity-api
* Did you make sure that the branch does not contain spurious tags?
Yes
- 2040. By Daniel d'Andrada on 2015-11-23
-
Update libunity-api-dev version dependency
| Daniel d'Andrada (dandrader) wrote : | # |
On 23/11/2015 07:41, Michał Sawicz wrote:
> Review: Needs Fixing
>
>
>
> Diff comments:
>
>> === modified file 'debian/control'
> You need to bump the unity-api Build-Depends to >=7.103
>
>
>
Done.

FAILED: Continuous integration, rev:2037 jenkins. qa.ubuntu. com/job/ unity8- ci/6699/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 5127/console jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- xenial- touch/114/ console jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/1411/ console jenkins. qa.ubuntu. com/job/ unity8- qmluitest- xenial- amd64/114/ console jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/1306/ console jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/1307/ console jenkins. qa.ubuntu. com/job/ unity8- xenial- amd64-ci/ 113/console jenkins. qa.ubuntu. com/job/ unity8- xenial- i386-ci/ 113/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 5139/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- xenial- armhf/114/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/6699/ rebuild
http://