Merge into trunk : filter-selector : Code : Unity 8

Status:	Superseded
Proposed branch:	lp:~nicolas-doffay/unity8/filter-selector
Merge into:	lp:unity8
Diff against target:	540 lines (+269/-24) 9 files modified Components/PageHeader.qml (+224/-19) Components/Stage.qml (+1/-1) Dash/Dash.qml (+3/-0) Dash/DashContent.qml (+9/-1) Dash/GenericScopeView.qml (+6/-0) Dash/ScopeListView.qml (+4/-0) Shell.qml (+3/-3) plugins/Unity/plugin.cpp (+2/-0) tests/qmltests/Components/tst_PageHeader.qml (+17/-0)
To merge this branch:	bzr merge lp:~nicolas-doffay/unity8/filter-selector
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Needs Fixing on 2013-10-02
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2013-10-02
Michael Zanetti (community)		2013-09-02	Needs Fixing on 2013-09-17
Review via email: mp+183503@code.launchpad.net

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-02:

#

The duration of the scrolling when opening and closing the filters will be longer and less "snap like", this is due to a bug in the SDK component (a fix has been prepared).

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-02:

#

Before I do the code review, please fix/clarify those things:

* The search lens icon is too big and shouldn't actually be that search lens but the filter icon.
* The filter icon should be inside the text field, as secondaryItem.
* Should the bottomDividers be a drag handle? I would assume you can drag this up again to dismiss
* tapping in the empty space at the bottom should dismiss it
* when filters opened, swiping the dash should not work until dismissed.
* the animation feels weird. It covers everything except the searchfield. Please check with design.
* it breaks the narrowMode decision. Try opening the search field and drag it smaller/bigger and compare that to trunk

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-02:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/855/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-03

229. By Nicolas d'Offay on 2013-09-03: Changed signal to onClicked.
230. By Nicolas d'Offay on 2013-09-03: Merged trunk.
231. By Nicolas d'Offay on 2013-09-03: Fixed swiping of dash while filters are visible.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-03:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/861/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-03

232. By Nicolas d'Offay on 2013-09-03: Moved filter button into search field.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-03:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/864/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-03:

#

Design is fine with it appearing beneath the search bar.
A drag handle isn't required, however it should be dismissed when selecting the background.

Still not quite sure how the narrow mode is broken. Mind making a video addressing this issue? I've tried experimenting.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-03:

#

> Still not quite sure how the narrow mode is broken. Mind making a video
> addressing this issue? I've tried experimenting.

http://i.imgur.com/ECrZmrB.png

Ignore the yellow bar at the bottom. I was just debugging some stuff in the first branch I could find on my hard drive.

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-03

233. By Nicolas d'Offay on 2013-09-03: Added inverse mouse area to dismiss filter selector.
234. By Nicolas d'Offay on 2013-09-03: Moved header z ordering up.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-03:

#

FAILED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/unity8-ci/876/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2945/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/877/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2951/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/514/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/876/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-03:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/878/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-04

235. By Nicolas d'Offay on 2013-09-04: Set filter height based on scopeView.
236. By Nicolas d'Offay on 2013-09-04: Removed unused narrowMode variable.
237. By Nicolas d'Offay on 2013-09-04: Changed visible to enabled in InverseMouseArea.
238. By Nicolas d'Offay on 2013-09-04: Merged trunk.
239. By Nicolas d'Offay on 2013-09-04: Reverted narrowMode in PageHeader.
240. By Nicolas d'Offay on 2013-09-04: Fixed whitespace in CMakeLists.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-04:

#

narrowMode is still broken: http://i.imgur.com/naTj5ce.jpg

Why did you move the property narrowMode anyways? I don't see why that change is needed.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-04:

#

* I can still swipe the dash left/right when the overlay is open.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-04:

#

There is some weirdness in the OptionSelector (not sure if it's related to this branch or to the OptionSelector in the SDK):

-> open the search field
-> click on the filter icon to open the overlay
-> click on categories to expand the optionselector
-> select the any entry but the first one
-> open the optionselector again => you will notice that after expanding it flicks up a little bit

This small movement seems to break the state:

* If you start dragging around now, you'll notice a weird jump of the whole list
* If you just collapse it again by clicking at the same item you had selected before, you'll notice that the item will be left half outside the view or even disappear completely (depending on which item you choose)

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-04:

#

200 + visible: index !== selectors.count - 1 ? true : false

You don't really need the "? true : false" here...

Why is the change to ScopeListView.qml needed at all? I can't see any reason for this.

Can we have tests for this please?

review: Needs Fixing

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-04

241. By Nicolas d'Offay on 2013-09-04: Removed old useless code.
242. By Nicolas d'Offay on 2013-09-04: Reverted narrowMode.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-04:

#

Unfortunately the issue with the jumping on selection is due to code in the Ubuntu UI Toolkit. Will go ahead and make the fixes there.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-04:

#

Fix for the scrolling issues lies here:

lp:~nicolas-doffay/ubuntu-ui-toolkit/scroll-nudging-fix

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-04:

#

It appears swiping issue with the dash was actually related to the filters "interactive" property not being set correctly. This is fixed on my machine, but would like a second opinion.

Tests are next on the agenda to ensure that the filters activate correctly. Feel free to suggest other potential tests, but I feel that the most important testable feature is that the backend works correctly with the UI.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-04:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/885/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-04

243. By Nicolas d'Offay on 2013-09-04: Added broken test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-04:

#

FAILED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/unity8-ci/889/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3000/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/564/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1510
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/890/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/889/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3006/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/566/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/889/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-05

244. By Nicolas d'Offay on 2013-09-05: Added wait to test expansion of filters drop down.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-05:

#

Unfortunately with regards to testing the OptionSelectors in the PageHeader it becomes slightly complicated unless a mock Scope is passed which I doubt is feasible. The custom delegates present which are coded specifically for the Scopes mean that setting models on these selectors from within the PageHeader would require exposing properties I feel should remain private in the PageHeader.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-05:

#

FAILED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/unity8-ci/906/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3042/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/603/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1533/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/907/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/906/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3048/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/605/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/906/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-05:

#

370 + wait(100);

there is a no-wait() policy in tests for my reviews ;) Use tryCompare()

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-05:

#

The icon is not used as secondaryItem in the TextField. This way, the text field has no idea where the input field should actually end and we things like this:
http://i.imgur.com/bdLyV55.png

===
128 + states: [ State {
138 + }, State {

line break missing

===
18 + property real scopeViewHeight
136 + height: scopeViewHeight - units.gu(8)

It's not certain that the PageHeader will only be used inside a ScopeView forever. Could be anything. Better name it filterSelectorHeight and set the final size from the outside. I know it has the downside that you need to copy the " - units.gu(8)" to all the places where you use it now, but it makes it flexible enough to be used in other places later, maybe even as a fullscreen overlay.

===
172 + boundsBehavior: Flickable.StopAtBounds

I don't think we're using StopAtBounds anywhere else. Feels different. Did you set this intentionally or is this just supposed to disable flicking when it is not required? In that case, try setting "interactive: contentHeight > height"

===
210 + text: i18n.tr(name)

I don't think this works... well, maybe... but still not the way to go. the translation should happen where the real string is defined, not around a variable that can change.

===
211 + containerHeight: units.gu(38)

can you explain why 38? Seems unflexible to me. shouldn't this be relative to the total available height?

===
259 + enabled: filterSelector.state === "expanded" ? true : false

don't really need the " ? true : false"

===
311 +import Ubuntu.Components.Popups 0.1

unused import

===
316 + anchors.fill: parent

This is a component. size should be set where this is used, not where it is defined. drop this line again.

===
314 + id: listView
...
321 + Connections {
322 + target: listView.pageHeader;
323 + onFilterSelectorVisibleChanged: listView.interactive = !pageHeader.filterSelectorVisible;
324 + }

Is this really needed? seems to me you could just do:

interactive: !pageHeader.filterSelectorVisible

===
370 + wait(100);

as noted before, this should be replaced by a tryCompare() to wait for the according things to happen

===
373 + compare(filterSelector.state, "expanded", "Filter selector did not expand.");
...
376 + compare(filterSelector.state, "collapsed", "Filter selector did not collapse");

This test is not really good. While it tests if internally the state really changes, it doesn't really test that the user actually can see that. It would be better to grab the Rectangle for the overlay, and tryCompare() that it eventually reaches the size which you have set in scopeViewHeight (or filterSelectorHeight once the above comment is fixed). Also, tryCompare() that the selectors actually become visible and hide again when collapsing.

The icon is not used as secondaryItem in the TextField. This way, the text field has no idea where the input field should actually end and we things like this:
http://i.imgur.com/bdLyV55.png

===
128	+ states: [ State {
138	+ }, State {

line break missing

===
18	+ property real scopeViewHeight
136	+ height: scopeViewHeight - units.gu(8)

It's not certain that the PageHeader will only be used inside a ScopeView forever. Could be anything. Better name it filterSelectorHeight and set the final size from the outside. I know it has the downside that you need to copy the " - units.gu(8)" to all the places where you use it now, but it makes it flexible enough to be used in other places later, maybe even as a fullscreen overlay.

===
172	+ boundsBehavior: Flickable.StopAtBounds

I don't think we're using StopAtBounds anywhere else. Feels different. Did you set this intentionally or is this just supposed to disable flicking when it is not required? In that case, try setting "interactive: contentHeight > height"

===
210	+ text: i18n.tr(name)

I don't think this works... well, maybe... but still not the way to go. the translation should happen where the real string is defined, not around a variable that can change.

===
211	+ containerHeight: units.gu(38)

can you explain why 38? Seems unflexible to me. shouldn't this be relative to the total available height?

===
259	+ enabled: filterSelector.state === "expanded" ? true : false

don't really need the " ? true : false"

===
311	+import Ubuntu.Components.Popups 0.1

unused import

===
316	+ anchors.fill: parent

This is a component. size should be set where this is used, not where it is defined. drop this line again.

===
314	+ id: listView
...
321	+ Connections {
322	+ target: listView.pageHeader;
323	+ onFilterSelectorVisibleChanged: listView.interactive = !pageHeader.filterSelectorVisible;
324	+ }

Is this really needed? seems to me you could just do:

interactive: !pageHeader.filterSelectorVisible

===
370	+ wait(100);

as noted before, this should be replaced by a tryCompare() to wait for the according things to happen

===
373	+ compare(filterSelector.state, "expanded", "Filter selector did not expand.");
...
376	+ compare(filterSelector.state, "collapsed", "Filter selector did not collapse");

This test is not really good. While it tests if internally the state really changes, it doesn't really test that the user actually can see that. It would be better to grab the Rectangle for the overlay, and tryCompare() that it eventually reaches the size which you have set in scopeViewHeight (or filterSelectorHeight once the above comment is fixed). Also, tryCompare() that the selectors actually become visible and hide again when collapsing.

review: Needs Fixing

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-06:

#

Valid points, thanks for the in depth review! Regarding some of the topics:

===
211 + containerHeight: units.gu(38)
can you explain why 38? Seems unflexible to me. shouldn't this be relative to the total available height?

* At the request of design, they specifically requested it be 38 grid units and not relative.
===
370 + wait(100);

as noted before, this should be replaced by a tryCompare() to wait for the according things to happen

* This was why I used wait: https://pastebin.canonical.com/97075/

===

373 + compare(filterSelector.state, "expanded", "Filter selector did not expand.");
...
376 + compare(filterSelector.state, "collapsed", "Filter selector did not collapse");

This test is not really good. While it tests if internally the state really changes, it doesn't really test that the user actually can see that. It would be better to grab the Rectangle for the overlay, and tryCompare() that it eventually reaches the size which you have set in scopeViewHeight (or filterSelectorHeight once the above comment is fixed). Also, tryCompare() that the selectors actually become visible and hide again when collapsing.

* Fair enough, but as mentioned before setting custom models on this specialised delegate requires a lot more variables to be exposed as aliases (including in the SDK) which I feel should be kept private. This is the reason I'm loathe to write more tests for the individual selectors.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-06:

#

> Valid points, thanks for the in depth review! Regarding some of the topics:
>
> ===
> 211 + containerHeight: units.gu(38)
> can you explain why 38? Seems unflexible to me. shouldn't this be relative to
> the total available height?
>
> * At the request of design, they specifically requested it be 38 grid units
> and not relative.

Ok. fine with me then. But I have to be skeptical when seeing such inflexible values.

> ===
> 370 + wait(100);
>
> as noted before, this should be replaced by a tryCompare() to wait for the
> according things to happen
>
> * This was why I used wait: https://pastebin.canonical.com/97075/

you need to use tryCompare to check if the TextField has become visible or if it has the activeFocus, or both... but just checking the state is not enough as that will change before the animation finishes (actually before it even starts)

>
> ===
>
> 373 + compare(filterSelector.state, "expanded", "Filter selector did not
> expand.");
> ...
> 376 + compare(filterSelector.state, "collapsed", "Filter selector did not
> collapse");
>
> This test is not really good. While it tests if internally the state really
> changes, it doesn't really test that the user actually can see that. It would
> be better to grab the Rectangle for the overlay, and tryCompare() that it
> eventually reaches the size which you have set in scopeViewHeight (or
> filterSelectorHeight once the above comment is fixed). Also, tryCompare() that
> the selectors actually become visible and hide again when collapsing.
>
> * Fair enough, but as mentioned before setting custom models on this
> specialised delegate requires a lot more variables to be exposed as aliases
> (including in the SDK) which I feel should be kept private. This is the reason
> I'm loathe to write more tests for the individual selectors.

No. that's ok... no need to test the optionselector itself in here (assuming they are in the SDK already - or about to land)... but please fix the opening of the overlay in a way I described above.

> Valid points, thanks for the in depth review! Regarding some of the topics:
> 
> ===
> 211     + containerHeight: units.gu(38)
> can you explain why 38? Seems unflexible to me. shouldn't this be relative to
> the total available height?
> 
> * At the request of design, they specifically requested it be 38 grid units
> and not relative.

Ok. fine with me then. But I have to be skeptical when seeing such inflexible values.

> ===
> 370     + wait(100);
> 
> as noted before, this should be replaced by a tryCompare() to wait for the
> according things to happen
> 
> * This was why I used wait: https://pastebin.canonical.com/97075/

you need to use tryCompare to check if the TextField has become visible or if it has the activeFocus, or both... but just checking the state is not enough as that will change before the animation finishes (actually before it even starts)

> 
> ===
> 
> 373     + compare(filterSelector.state, "expanded", "Filter selector did not
> expand.");
> ...
> 376     + compare(filterSelector.state, "collapsed", "Filter selector did not
> collapse");
> 
> This test is not really good. While it tests if internally the state really
> changes, it doesn't really test that the user actually can see that. It would
> be better to grab the Rectangle for the overlay, and tryCompare() that it
> eventually reaches the size which you have set in scopeViewHeight (or
> filterSelectorHeight once the above comment is fixed). Also, tryCompare() that
> the selectors actually become visible and hide again when collapsing.
> 
> * Fair enough, but as mentioned before setting custom models on this
> specialised delegate requires a lot more variables to be exposed as aliases
> (including in the SDK) which I feel should be kept private. This is the reason
> I'm loathe to write more tests for the individual selectors.

No. that's ok... no need to test the optionselector itself in here (assuming they are in the SDK already - or about to land)... but please fix the opening of the overlay in a way I described above.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-06:

#

"you need to use tryCompare to check if the TextField has become visible or if it has the activeFocus, or both... but just checking the state is not enough as that will change before the animation finishes (actually before it even starts)"

The issue with this is regardless of what variable I test with tryCompare I always get the same error when running the test:

https://pastebin.canonical.com/97090/

No idea what's causing this.

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-06

245. By Nicolas d'Offay on 2013-09-06: Worked through MP comments and applied relevant changes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-06:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/937/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-10

246. By Nicolas d'Offay on 2013-09-10: Removed anchor.fill from ListView.
247. By Nicolas d'Offay on 2013-09-10: Merged trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-10:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/963/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-10

248. By Nicolas d'Offay on 2013-09-10: Fixed MP bugs.
249. By Nicolas d'Offay on 2013-09-10: Renamed variable in test.

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-09-10:

#

Functional issues (some of those might not be bugs or directly related to this MR):
* the filter icon in PageHeader is stretched
* the selectors scroll half-item up when opening (but only when a second or further option is selected - is this really as designed?)
* selecting filters doesn't actually apply them on the result set
* as per the expansion pattern design, the selectors should expand and the view should scroll to show as much content as possible (up to almost the full height) - currently you have to scroll the view manually to see all of the options in the second or further selector
* there is no overshoot in the option selector - no feedback when you reach beginning or end of the option list

review: Needs Fixing (functional)

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-10:

#

Functional issues (some of those might not be bugs or directly related to this MR):
* the filter icon in PageHeader is stretched
* the selectors scroll half-item up when opening (but only when a second or further option is selected - is this really as designed?)
* selecting filters doesn't actually apply them on the result set
* as per the expansion pattern design, the selectors should expand and the view should scroll to show as much content as possible (up to almost the full height) - currently you have to scroll the view manually to see all of the options in the second or further selector
* there is no overshoot in the option selector - no feedback when you reach beginning or end of the option list

----------------------------------------------------------------

* I'll bring up the filter icon size with design.
* Yes it is.
* Looking into this with Pawel.
* The overshoot has been fixed in another branch in the SDK which is waiting to land currently.

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-10

250. By Nicolas d'Offay on 2013-09-10: Changed index name.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-10:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/966/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-10

251. By Nicolas d'Offay on 2013-09-10: Set prior index active to false.
252. By Nicolas d'Offay on 2013-09-10: Changed cdimensions of filter icon.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-10:

#

Applying filters issue has been solved in revision 251. Confirmed by Pawel.

Confirmed with design that the filter's icon is 3x3 grid units. Set accordingly. If it looks stretched then the asset is incorrect and should be seen to.

Ideally I'd like to shed more light on the expansion pattern and have scheduled a hangout session tomorrow with Jouni.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-10:

#

After setting the icon to 3x3 it looks really bad. The asset in the icon pack must be a different size. Sending a screen to design to get it seen to.

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-10

253. By Nicolas d'Offay on 2013-09-10: Made changes to filter icon and colour.
254. By Nicolas d'Offay on 2013-09-10: Fixed up test for Filter selector.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-10:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/971/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-10:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/975/rebuild

review: Approve (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-12

255. By Nicolas d'Offay on 2013-09-12: Added broken positionViewAtIndex.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-12:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/999/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-13:

#

As stated before, remove the color from the filter icon, set it as secondaryItem and remove the anchors. it'll fix the scaling issue

review: Needs Fixing

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-13

256. By Nicolas d'Offay on 2013-09-13: First pass of scrolling.
257. By Nicolas d'Offay on 2013-09-13: Added behaviour on contentY to filters.
258. By Nicolas d'Offay on 2013-09-13: Fixed icon.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-13:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1003/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-13:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1007/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-16:

#

doesn't compile and conflicts with trunk

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-16:

#

* icon still too small
* test still goes under the icon when typing into the text field
* clipping missing when expanding a optionselector that doesn't fit into the screen
* like the other items (for example HUD) it should disappear the the launcher is opened
* right edge gesture should be disabled when opened.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-16:

#

Should have been:

* text still goes under the icon when typing into the text field

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-16:

#

Icon size was decided upon by design.

Not sure what you mean about the OptionSelector that doesn't fit onto the screen not being clipped. The triangle is clipped correctly, however there was an issue that the clipping was happening too late at the bottom of the rectangle. I've fixed this now. I'll be looking what else you mentioned too.

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-16

259. By Nicolas d'Offay on 2013-09-16: Fixed a bug that didn't disable the rightEdge when set, fixed most recent MP comments.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-16:

#

The right edge now collapses the filters. But in all the other overlays, the right edge is disabled while the overlay is opened.

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-16:

#

22 + property bool launcherShown

I don't think this should be called "launcherShown". It could be used for other stuff too. Actually I think this should not exist at all. You already have the property filterSelectorVisible. Instead of just using that to propagate the current state to the outside, also allow writing that from the outside. So in Shell.qml, when the launcher becomes visible, just directly set filterSelectorVisible to false from there.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-16:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1017/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-09-16:

#

Components/PageHeader.qml:477:25: Cannot assign to non-existent property "onExpansionCompleted"

review: Needs Fixing

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-17

260. By Nicolas d'Offay on 2013-09-17: Fixed filter dismissal issue with inverse mouse area by changing it to mouse area.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-17:

#

Components/PageHeader.qml:477:25: Cannot assign to non-existent property "onExpansionCompleted"
-----------

This is present in the branch which this MP is reliant upon. It's linked here.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-17:

#

Reliant branch:

~nicolas-doffay/ubuntu-ui-toolkit/multi-selectors

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-17:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1023/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-09-17:

#

another one... clicking at the edges actually makes the click go through the filters overlay.

review: Needs Fixing

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-17

261. By Nicolas d'Offay on 2013-09-17: Removed launcher show variable and attempted to hide filters on launcher shown.
262. By Nicolas d'Offay on 2013-09-17: Removed filter close for search popup.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-09-17:

#

My reason for keeping this launcherShown way of doing things was line 399 in the diff. I'm unsure of how to alias the variable which is contained on item and since the assignment is done "one way" I figured passing in a separate variable would be the only option.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-17:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1029/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-09-17:

#

Test was aborted, but has been re-triggered.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-17:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1031/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-17:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1033/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-19

263. By Nicolas d'Offay on 2013-09-19: Added dismisal area for search to PageHeader.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-19:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1042/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-19

264. By Nicolas d'Offay on 2013-09-19: Merged trunk.
265. By Nicolas d'Offay on 2013-09-19: Updated PageHeader test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-19:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1043/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2013-09-19:

#

The autopilot-testrunner-otto-saucy results didn't get published to the external jenkins. If you need them, they are here: http://10.97.2.10:8080/job/autopilot-testrunner-otto-saucy/4/ (Future results will be published, this one just missed it).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-19:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1044/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-20:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1051/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-20:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1060/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1082/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-24:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1090/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-09-24:

#

4 QML tests failing

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-26

266. By Nicolas d'Offay on 2013-09-26: Merged trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1131/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-26

267. By Nicolas d'Offay on 2013-09-26: Merged search in progress branch.
268. By Nicolas d'Offay on 2013-09-26: Added indicator for searching.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1142/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-26

269. By Nicolas d'Offay on 2013-09-26: Removed indicator being displayed when clearing search.
270. By Nicolas d'Offay on 2013-09-26: Disabled button while indicator is active.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1146/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1149/rebuild

review: Needs Fixing (continuous-integration)

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-09-27

271. By Nicolas d'Offay on 2013-09-27: Removed indicator and keyboard dismissal code.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-27:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1157/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-09-30:

#

Is this ready for re-review?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-02:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1209/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-10-02:

#

There's a conflict, please merge trunk.

review: Needs Fixing

lp:~nicolas-doffay/unity8/filter-selector updated on 2013-11-15

272. By Nicolas d'Offay on 2013-10-15: Removed search indicator.
273. By Nicolas d'Offay on 2013-10-15: Merged trunk.
274. By Nicolas d'Offay on 2013-10-21: Attempt to fix bad whitespace.
275. By Nicolas d'Offay on 2013-10-23: Fixed transparent input zone and moved drop down to the left.
276. By Nicolas d'Offay on 2013-10-24: Added Orange rect to filter icon with Ubuntu shape.
277. By Nicolas d'Offay on 2013-10-25: Added black Ubuntu shape to filters.
278. By Nicolas d'Offay on 2013-10-25: Added coloured filters icon which changes with expansion of fliters.
279. By Nicolas d'Offay on 2013-10-28: Fixed up clipping regions.
280. By Nicolas d'Offay on 2013-11-05: Merged trunk.
281. By Nicolas d'Offay on 2013-11-06: Fixed apparently bad whitespace.
282. By Nicolas d'Offay on 2013-11-15: Added search dismal when tapping outside filter selector and disabled other filters when currently selected filter dropdown is expanded.
283. By Nicolas d'Offay on 2013-11-15: Removed null assignment.

Unity 8

Merge lp:~nicolas-doffay/unity8/filter-selector into lp:unity8

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers

 === modified file 'Components/PageHeader.qml'
 --- Components/PageHeader.qml	2013-10-07 08:36:52 +0000
 +++ Components/PageHeader.qml	2013-10-15 10:28:49 +0000
@@ -31,7 +31,13 @@
      property bool searchEntryEnabled: false
      property alias searchQuery: searchField.text
      property ListModel searchHistory: SearchHistoryModel {}
++    property bool filterSelectorVisible: filterSelector.state === "expanded"
      property Scope scope
++    property real filterSelectorHeight
++    property real filterBottomSpace
++    property bool launcherShown
++
++    onLauncherShownChanged: if (launcherShown) filterSelector.state = "collapsed"
      height: units.gu(8.5)
      implicitHeight: units.gu(8.5)
@@ -55,13 +61,16 @@
      Flickable {
          id: header
++        objectName: "searchHeader"
++
          anchors {
              left: parent.left
              right: parent.right
              top: parent.top
+         }
++
++        z: 2
          height: units.gu(6.5)
--
          interactive: false
          contentHeight: headerContainer.height
          clip: true
@@ -74,8 +83,10 @@
          Item {
              id: headerContainer
--            width: parent.width
--            height: childrenRect.height
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
              Item {
                  id: textContainer
@@ -110,7 +121,6 @@
                  visible: searchEntryEnabled
                  property bool narrowMode: parent.width < label.contentWidth + units.gu(50)
--
                  property bool active: searchField.text != "" || searchField.activeFocus
                  property var popover: null
@@ -136,7 +146,8 @@
+                 }
                  function closePopover() {
--                    if (searchContainer.popover) PopupUtils.close(searchContainer.popover)
++                    if (searchContainer.popover)
++                        PopupUtils.close(searchContainer.popover)
+                 }
                  onActiveFocusChanged: if (!activeFocus) { searchHistory.addQuery(searchField.text) }
@@ -144,8 +155,10 @@
                  TextField {
                      id: searchField
--                    anchors.fill: parent
--                    anchors.margins: units.gu(1)
++                    anchors {
++                        fill: parent
++                        margins: units.gu(1)
++                    }
                      hasClearButton: false
@@ -194,6 +207,44 @@
+                         }
+                     }
++                    secondaryItem: Item {
++                        width: childrenRect.width
++                        height: units.gu(3)
++
++                        anchors {
++                            right: parent.right
++                            verticalCenter: parent.verticalCenter
++                        }
++
++                        Icon {
++                            id: filterIcon
++                            objectName: "filterIcon"
++
++                            width: units.gu(3)
++
++                            name: "filter"
++
++                            anchors {
++                                right: parent.right
++                                top: parent.top
++                                bottom: parent.bottom
++                            }
++
++                            MouseArea {
++                                id: filterClick
++
++                                anchors.fill: parent
++                                onPressed: {
++                                    if (filterSelector.state === "expanded") {
++                                        filterSelector.state = "collapsed"
++                                    } else {
++                                        filterSelector.state = "expanded"
++                                    }
++                                }
++                            }
++                        }
++                    }
++
                      onTextChanged: {
                          if (text != "") searchContainer.closePopover()
                          else if (text == "" && activeFocus) searchContainer.openPopover()
@@ -356,26 +407,180 @@
+                         }
+                     }
+                 }
--
--                InverseMouseArea {
--                    enabled: searchField.activeFocus
--
++            }
++        }
++    }
++
++    Rectangle {
++        id: filterSelector
++        objectName: "filterSelector"
++
++        opacity: 0.9
++        color: Theme.palette.normal.background
++        clip: true
++        state: "collapsed"
++        z: 1
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++        states: [
++            State {
++                name: "expanded"
++                PropertyChanges {
++                    target: selectors
++                    opacity: 1
++                }
++                PropertyChanges {
++                    target: filterSelector
++                    height: filterSelectorHeight - filterBottomSpace
++                }
++            },
++            State {
++                name: "collapsed"
++                PropertyChanges {
++                    target: selectors
++                    opacity: 0
++                }
++                PropertyChanges {
++                    target: filterSelector
++                    height: 0
++                }
++            }
++        ]
++
++        Behavior on height {
++            UbuntuNumberAnimation {
++                properties: "height"
++                duration: UbuntuAnimation.BriskDuration
++            }
++        }
++
++        MouseArea {
++            clip: true
++
++            anchors {
++                fill: parent
++                topMargin: units.gu(9)
++                bottomMargin: units.gu(2)
++            }
++
++            ListView {
++                id: selectors
++                objectName: "selectors"
++
++                spacing: units.gu(1)
++                model: scope ? scope.filters : null
++                delegate: optionSelector
++                anchors {
++                    fill: parent
++                    leftMargin: units.gu(2)
++                    rightMargin: units.gu(2)
++                    bottomMargin: units.gu(2)
++                }
++
++                Behavior on opacity {
++                    UbuntuNumberAnimation {
++                        properties: "opacity"
++                        duration: UbuntuAnimation.BriskDuration
++                    }
++                }
++
++                Behavior on contentY {
++                    UbuntuNumberAnimation {
++                        properties: "contentY"
++                        duration: UbuntuAnimation.BriskDuration
++                    }
++                }
++            }
++
++            Component {
++                id: optionSelector
++
++                Column {
++                    spacing: units.gu(2)
                      anchors {
--                        top: parent.top
                          left: parent.left
                          right: parent.right
+                     }
--
--                    height: searchContainer.popover ? parent.height + searchContainer.popover.contentHeight + units.gu(2) : parent.height
--
--                    onPressed: searchField.focus = false
--                }
--            }
--        }
++                    OptionSelector {
++                        id: selector
++
++                        property real collapsedHeight
++                        property real expandedHeight
++
++                        text: name
++                        containerHeight: units.gu(38)
++                        model: options
++                        delegate: OptionSelectorDelegate { text: name }
++                        onDelegateClicked: {
++                            options.setActive(selectedIndex, !active);
++                            options.setActive(index, active);
++                        }
++
++                        onExpandedChanged: {
++                            collapsedHeight = height;
++                        }
++
++                        onExpansionCompleted: {
++                            expandedHeight = height;
++
++                            var delta = expandedHeight - collapsedHeight;
++
++                            if (!selectors.atYBeginning) {
++                                selectors.contentY += delta;
++                            }
++                        }
++                    }
++                    ListItem.ThinDivider {
++                        visible: index !== selectors.count - 1
++                        anchors {
++                            leftMargin: units.gu(-2)
++                            rightMargin: units.gu(-2)
++                        }
++                    }
++                }
++            }
++        }
++
++        Item {
++            id: bottomDividers
++
++            height: units.gu(2)
++            anchors {
++                left: parent.left
++                right: parent.right
++                bottom: parent.bottom
++            }
++            ListItem.ThinDivider {
++                anchors {
++                    bottom: parent.bottom
++                }
++            }
++            ListItem.ThinDivider {
++                anchors {
++                    top: parent.top
++                }
++            }
++        }
++    }
++
++    MouseArea {
++        objectName: "mouseArea"
++
++        height: filterBottomSpace
++        anchors {
++            left: parent.left
++            right: parent.right
++            top: filterSelector.bottom
++        }
++        enabled: filterSelector.state === "expanded"
++        onPressed: filterSelector.state = "collapsed"
+     }
      BorderImage {
          id: bottomBorder
++
          anchors {
              top: header.bottom
              left: parent.left
 === modified file 'Components/Stage.qml'
 --- Components/Stage.qml	2013-10-11 10:24:30 +0000
 +++ Components/Stage.qml	2013-10-15 10:28:49 +0000
@@ -451,7 +451,7 @@
          enabled: {
              if (status == DirectionalDragArea.WaitingForTouch) {
                  return switchToApplicationAnimationController.completed
--                        && stage.applications.count > 0 && stage.rightEdgeEnabled
++                        && stage.applications.count > 0 || stage.rightEdgeEnabled
                          && !delayedHideScreenshots.running
              } else {
                  return true
 === modified file 'Dash/Dash.qml'
 --- Dash/Dash.qml	2013-09-24 09:52:37 +0000
 +++ Dash/Dash.qml	2013-10-15 10:28:49 +0000
@@ -29,6 +29,8 @@
      property alias contentProgress: dashContent.contentProgress
      property string showScopeOnLoaded: "home.scope"
      property real contentScale: 1.0
++    property bool launcherShown
++    property alias filterSelectorShown: dashContent.filterSelectorShown
      function setCurrentScope(scopeId, animate, reset) {
          var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)
@@ -63,6 +65,7 @@
          anchors.fill: parent
          model: filteredScopes
          scopes: scopes
++        launcherShown: dash.launcherShown
          onMovementStarted: dashbar.startNavigation()
          onMovementEnded: dashbar.stopNavigation()
          onContentFlickStarted: dashbar.finishNavigation()
 === modified file 'Dash/DashContent.qml'
 --- Dash/DashContent.qml	2013-10-11 10:07:25 +0000
 +++ Dash/DashContent.qml	2013-10-15 10:28:49 +0000
@@ -25,6 +25,8 @@
      property var scopes: null
      property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
      property alias currentIndex: dashContentList.currentIndex
++    property bool launcherShown
++    property bool filterSelectorShown
      property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
@@ -83,7 +85,7 @@
          id: dashContentList
          objectName: "dashContentList"
--        interactive: dashContent.scopes.loaded && !currentItem.previewShown && !currentItem.moving
++        interactive: dashContent.scopes.loaded && !currentItem.previewShown && !currentItem.moving && !filterSelectorShown
          anchors.fill: parent
          model: dashContent.model
@@ -119,6 +121,8 @@
                  readonly property bool previewShown: item.previewShown
                  readonly property bool moving: item.moving
++                property bool launcherShown: dashContent.launcherShown
++
                  // these are needed for autopilot tests
                  readonly property string scopeId: scope.id
                  readonly property bool isCurrent: ListView.isCurrentItem
@@ -132,10 +136,14 @@
                      dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
                      dashContent.scopeLoaded(item.scope.id)
+                 }
++
++                onLauncherShownChanged: item !== null? item.launcherShown = launcherShown : false
++
                  Connections {
                      target: item
                      ignoreUnknownSignals: true
                      onEndReached: contentEndReached()
++                    onFilterSelectorVisibleChanged: filterSelectorShown = item.filterSelectorVisible
                      onPreviewShownChanged: {
                          if (item.previewShown) {
                              dashContent.previewShown()
 === modified file 'Dash/GenericScopeView.qml'
 --- Dash/GenericScopeView.qml	2013-10-11 10:45:36 +0000
 +++ Dash/GenericScopeView.qml	2013-10-15 10:28:49 +0000
@@ -21,7 +21,10 @@
  ScopeView {
      id: scopeView
++
      readonly property alias previewShown: previewLoader.onScreen
++    property bool launcherShown
++    property alias filterSelectorVisible: pageHeader.filterSelectorVisible
      property bool enableHeightBehaviorOnNextCreation: false
      moving: categoryView.moving
@@ -223,6 +226,9 @@
              text: scopeView.scope.name
              searchEntryEnabled: true
              scope: scopeView.scope
++            filterSelectorHeight: scopeView.height
++            filterBottomSpace: units.gu(8)
++            launcherShown: scopeView.launcherShown
+         }
+     }
 === modified file 'Dash/ScopeListView.qml'
 --- Dash/ScopeListView.qml	2013-10-11 11:41:27 +0000
 +++ Dash/ScopeListView.qml	2013-10-15 10:28:49 +0000
@@ -18,9 +18,13 @@
  import ListViewWithPageHeader 0.1
  ListViewWithPageHeader {
++    id: listView
++
      maximumFlickVelocity: height * 10
      flickDeceleration: height * 2
++    interactive: !pageHeader.filterSelectorVisible
++
      Connections {
          target: greeter
          onShownChanged: if (greeter.shown) showHeader()
 === modified file 'Shell.qml'
 --- Shell.qml	2013-10-14 20:20:18 +0000
 +++ Shell.qml	2013-10-15 10:28:49 +0000
@@ -200,6 +200,7 @@
              hides: [stages, launcher, panel.indicators]
              shown: disappearingAnimationProgress !== 1.0
              enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
++            launcherShown: launcher.shown
              // FIXME: unfocus all applications when going back to the dash
              onEnabledChanged: {
                  if (enabled) {
@@ -299,8 +300,7 @@
                  fullyShown: stages.fullyShown
                  fullyHidden: stages.fullyHidden
                  shouldUseScreenshots: !fullyShown
--                rightEdgeEnabled: !sideStage.enabled
--
++                rightEdgeEnabled: !sideStage.enabled && !dash.filterSelectorShown
                  applicationManager: shell.applicationManager
                  rightEdgeDraggingAreaWidth: shell.edgeSize
                  normalApplicationY: shell.panelHeight
@@ -390,7 +390,7 @@
                  width: shell.edgeSize
                  direction: Direction.Leftwards
--                enabled: greeter.showProgress == 0 && edgeDemo.dashEnabled
++                enabled: greeter.showProgress == 0 && edgeDemo.dashEnabled && !dash.filterSelectorShown
                  property bool haveApps: mainStage.applications.count > 0 || sideStage.applications.count > 0
                  maxTotalDragDistance: haveApps ? parent.width : parent.width * 0.7
 === modified file 'plugins/Unity/plugin.cpp'
 --- plugins/Unity/plugin.cpp	2013-09-24 12:52:55 +0000
 +++ plugins/Unity/plugin.cpp	2013-10-15 10:28:49 +0000
@@ -25,6 +25,7 @@
  #include "plugin.h"
  // local
++#include "genericoptionsmodel.h"
  #include "preview.h"
  #include "previewaction.h"
  #include "previewinfohint.h"
@@ -50,6 +51,7 @@
      qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");
      qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");
      qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");
++    qmlRegisterUncreatableType<Filters>(uri, 0, 1, "Filters", "Can't create filters object in QML.");
      qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");
      qmlRegisterUncreatableType<Result>(uri, 0, 1, "Result", "Can't create result object in QML.");
      qmlRegisterType<Scope>(uri, 0, 1, "Scope");
 === modified file 'tests/qmltests/Components/tst_PageHeader.qml'
 --- tests/qmltests/Components/tst_PageHeader.qml	2013-10-07 08:24:34 +0000
 +++ tests/qmltests/Components/tst_PageHeader.qml	2013-10-15 10:28:49 +0000
@@ -21,6 +21,7 @@
  import Ubuntu.Components 0.1
  import Unity 0.1
  import Unity.Test 0.1 as UT
++import Unity 0.1
  Item {
      width: units.gu(110)
@@ -138,6 +139,20 @@
              compare(pageHeader.searchHistory.get(0).query, "humppa4")
+         }
++        function test_filter_overlay() {
++            var filterIcon = findChild(pageHeader, "filterIcon");
++            var filterSelector = findChild(pageHeader, "filterSelector");
++            var mouseArea = findChild(pageHeader, "mouseArea");
++            var searchHeader = findChild(pageHeader, "searchHeader");
++
++            pageHeader.triggerSearch();
++            tryCompare(searchHeader, "contentY", 0);
++
++            mouseClick(filterIcon, 2, 2);
++            compare(filterSelector.state, "expanded", "Filter selector did not expand.");
++        }
++
++
          function test_search_indicator() {
              var searchIndicator = findChild(pageHeader, "searchIndicator")
              var primaryImage = findChild(pageHeader, "primaryImage")
@@ -158,6 +173,7 @@
          function cleanup() {
              scopeMock.searchInProgress = false
+         }
++
+     }
      Column {
@@ -175,6 +191,7 @@
              searchEntryEnabled: true
              text: "%^$%^%^&%^&%^$%GHR%"
++            filterSelectorHeight: units.gu(30)
+         }
          Row {