Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/dontFocusDisabledLi into lp://qastaging/ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri
Status: Merged
Approved by: Zsombor Egri
Approved revision: 2085
Merged at revision: 2103
Proposed branch: lp://qastaging/~zsombi/ubuntu-ui-toolkit/dontFocusDisabledLi
Merge into: lp://qastaging/ubuntu-ui-toolkit/staging
Diff against target: 223 lines (+113/-24)
5 files modified
src/UbuntuToolkit/privates/listviewextensions.cpp (+22/-23)
src/UbuntuToolkit/privates/listviewextensions_p.h (+4/-0)
src/UbuntuToolkit/uclistitem_p.h (+1/-0)
src/imports/Components/1.3/UbuntuListView.qml (+5/-1)
tests/unit/visual/tst_listitem_focus_bug.13.qml (+81/-0)
To merge this branch: bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/dontFocusDisabledLi
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+305194@code.qastaging.launchpad.net

Commit message

Do not show focus frame on disabled items.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

armhf failure is broken arale-07, but there's error on gles error.

Revision history for this message
Tim Peeters (tpeeters) wrote :

This seems good, but I will merge it into my toolbar scrolling branch to see if I can get that to work properly with disabled actions.

Revision history for this message
Tim Peeters (tpeeters) wrote :

The scrolling actionbar still needs some tweaks (I need visual designs for the focus), but this one is good to go!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

I cancelled the happroval. The code example in https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1590005 still does not work.

review: Needs Fixing
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

Okay. Looks good now. That bug will be fixed separately.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

privates/listviewextensions.cpp: In member function 'QQuickItem* ListViewProxy::currentItem()':
privates/listviewextensions.cpp:60:1: error: control reaches end of non-void function [-Werror=return-type]
 }

Weird. Looks fine to me. Maybe explicit casting will help?

Revision history for this message
Tim Peeters (tpeeters) wrote :

Is it not possible to just return _currentItem ?

2083. By Zsombor Egri

return change

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2084. By Zsombor Egri

gles should kiss my...

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

perhaps the QPointer header needs to be included in the cpp

Revision history for this message
Zsombor Egri (zsombi) wrote :

> perhaps the QPointer header needs to be included in the cpp
It is declared in the header, why the hell would I need to include it in the cpp?

Revision history for this message
Tim Peeters (tpeeters) wrote :

Yes you defined the class so you can use the type in the header, but you didn't include the actual API. You could do that in the header, but supposedly compilation will be faster if you keep the includes in the header to a minimum.

Now there is a merge conflict:
+<<<<<<< TREE
94
95 #include <UbuntuToolkit/ubuntutoolkitglobal.h>
96 +=======
97 +#include <QtCore/QPointer>
98 +#include <ubuntutoolkitglobal.h>
99 +>>>>>>> MERGE-SOURCE

probably because of the header cleanups that landed on staging.

2085. By Zsombor Egri

staging sync

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches