Unity 8

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

filter-selector
Merge into trunk

Proposed by Nicolas d'Offay on 2013-10-15

Status:	Rejected
Rejected by:	Michael Zanetti on 2014-07-15
Proposed branch:	lp:~nicolas-doffay/unity8/filter-selector
Merge into:	lp:unity8
Diff against target:	564 lines (+295/-24) 9 files modified Components/PageHeader.qml (+252/-19) Components/Stage.qml (+1/-1) Dash/Dash.qml (+3/-0) Dash/DashContent.qml (+9/-1) Dash/GenericScopeView.qml (+5/-0) Dash/ScopeListView.qml (+3/-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		2013-10-15	Disapprove on 2014-07-15
PS Jenkins bot (community)	continuous-integration	2013-10-15	Needs Fixing on 2013-11-18
Michael Zanetti		2013-10-15	Pending
Review via email: mp+191145@code.launchpad.net

Commit message

Added filters drop down.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1409/rebuild

review: Needs Fixing (continuous-integration)

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

274. By Nicolas d'Offay on 2013-10-21: Attempt to fix bad whitespace.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1460/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Looking at https://docs.google.com/a/canonical.com/presentation/d/1X3_G6reCpcFJxzxn1Xtv9wK5n3-wOW-6z2l0qSZ8-sg/present#slide=id.gefa49ee0_021 for reference:

The first option seems to always be selected, be it "All" or something else.

The filter icon is too close to the right edge.

The filter button doesn't change to orange when active.

I can expand two filters at the same time - please confirm that's the desired behaviour.

There's no way to cancel a selection - shouldn't tapping outside of the expanded selector collapse it - please confirm the desired behaviour.

The expanded height is hardcoded, so when you make the window smaller, you can't scroll the filters any more. We should really look into fixing bug #1169258 first - and use it here.

The overlay is transparent to input at the 2GU margin between the crop line and the filter panel's edge.

review: Needs Fixing

Revision history for this message

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

There will most likely have to be another option added to the backend to get past this issue. I don't think it's a good solution changing the design of the SDK component to cater for one use case.

I think it's apparent that an SDK expansion pattern will have to be done if this branch is to land. I'll bring this up with the SDK team.

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

275. By Nicolas d'Offay on 2013-10-23: Fixed transparent input zone and moved drop down to the left.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1479/rebuild

review: Needs Fixing (continuous-integration)

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

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.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1495/rebuild

review: Needs Fixing (continuous-integration)

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

279. By Nicolas d'Offay on 2013-10-28: Fixed up clipping regions.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1500/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1578/rebuild

review: Needs Fixing (continuous-integration)

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

280. By Nicolas d'Offay on 2013-11-05: Merged trunk.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1581/rebuild

review: Needs Fixing (continuous-integration)

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

281. By Nicolas d'Offay on 2013-11-06: Fixed apparently bad whitespace.

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1584/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1587/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-11-13:

Still to-fix here:

> The first option seems to always be selected, be it "All" or something else.

> The filter button doesn't change to orange when active.

It does now, but oh it looks bad... it's misaligned and rounded on the left-hand side... Better use a PNG instead?

> I can expand two filters at the same time - please confirm that's the desired behaviour.

> There's no way to cancel a selection - shouldn't tapping outside of the expanded selector collapse it - please confirm the desired behaviour.

> The expanded height is hardcoded, so when you make the window smaller, you can't scroll the filters any more. We should really look into fixing bug #1169258 first - and use it here.

review: Needs Fixing

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

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.

Revision history for this message

Nicolas d'Offay (nicolas-doffay) wrote on 2013-11-15:

I've addressed every comment aside from the PNG and the hardcoded height. I've made design aware of the icon issue and will most likely get an asset to use on Monday.

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

283. By Nicolas d'Offay on 2013-11-15: Removed null assignment.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-11-22:

We've decided this will have to wait for the upcoming new scope backend.

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-07-15:

Aand the design changed completely.

review: Disapprove

Unmerged revisions

283. By Nicolas d'Offay on 2013-11-15: Removed null assignment.
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.
281. By Nicolas d'Offay on 2013-11-06: Fixed apparently bad whitespace.
280. By Nicolas d'Offay on 2013-11-05: Merged trunk.
279. By Nicolas d'Offay on 2013-10-28: Fixed up clipping regions.
278. By Nicolas d'Offay on 2013-10-25: Added coloured filters icon which changes with expansion of fliters.
277. By Nicolas d'Offay on 2013-10-25: Added black Ubuntu shape to filters.
276. By Nicolas d'Offay on 2013-10-24: Added Orange rect to filter icon with Ubuntu shape.
275. By Nicolas d'Offay on 2013-10-23: Fixed transparent input zone and moved drop down to the left.
274. By Nicolas d'Offay on 2013-10-21: Attempt to fix bad whitespace.

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:

Mohammad Rakibul Hasan

Nicolas d'Offay

Unity Team

 === modified file 'Components/PageHeader.qml'
 --- Components/PageHeader.qml	2013-10-18 09:12:39 +0000
 +++ Components/PageHeader.qml	2013-11-15 17:29:44 +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)
@@ -59,13 +65,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
@@ -78,8 +87,10 @@
          Item {
              id: headerContainer
--            width: parent.width
--            height: childrenRect.height
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
              Item {
                  id: textContainer
@@ -114,7 +125,6 @@
                  visible: searchEntryEnabled
                  property bool narrowMode: parent.width < label.contentWidth + units.gu(50)
--
                  property bool active: searchField.text != "" || searchField.activeFocus
                  property var popover: null
@@ -140,7 +150,8 @@
+                 }
                  function closePopover() {
--                    if (searchContainer.popover) PopupUtils.close(searchContainer.popover)
++                    if (searchContainer.popover)
++                        PopupUtils.close(searchContainer.popover)
+                 }
                  onActiveFocusChanged: if (!activeFocus) { searchHistory.addQuery(searchField.text) }
@@ -148,8 +159,10 @@
                  TextField {
                      id: searchField
--                    anchors.fill: parent
--                    anchors.margins: units.gu(1)
++                    anchors {
++                        fill: parent
++                        margins: units.gu(1)
++                    }
                      hasClearButton: false
@@ -198,6 +211,48 @@
+                         }
+                     }
++                    secondaryItem: UbuntuShapeForItem {
++                        id: ubuntuShape
++                        width: units.gu(4)
++
++                        anchors {
++                            rightMargin: units.dp(-5)
++                            right: parent.right
++                            top: parent.top
++                        }
++
++                        image: Rectangle {
++                            width: ubuntuShape.width
++                            height: ubuntuShape.height
++                            color: filterSelector.state === "expanded" ? "#DD4814" : "white"
++                        }
++
++                        Icon {
++                            id: filterIcon
++                            objectName: "filterIcon"
++
++                            width: units.gu(4)
++                            height: units.gu(4)
++                            name: "filter"
++                            color: filterSelector.state === "expanded" ? "white" : "#AEA79F"
++
++                            anchors.centerIn: parent
++
++                            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()
@@ -360,26 +415,204 @@
+                         }
+                     }
+                 }
--
--                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"
++
++                property QtObject activeSelector: null
++                property bool filterExpanded: false
++
++                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
--                }
--            }
--        }
++                    InverseMouseArea {
++                        id: dismissalArea
++                        anchors {
++                            left: parent.left
++                            right: parent.right
++                        }
++                        height: childrenRect.height
++                        enabled: selector.currentlyExpanded
++
++                        onPressed: selector.currentlyExpanded = false;
++                        ListItem.ItemSelector {
++                            id: selector
++
++                            property real collapsedHeight
++                            property real expandedHeight
++
++                            text: name
++                            containerHeight: units.gu(38)
++                            model: options
++                            ubuntuShapeBackground: true
++                            delegate: ListItem.ItemSelectorDelegate { text: name }
++                            enabled: selectors.activeSelector === selector || !selectors.filterExpanded
++                            onCurrentlyExpandedChanged: {
++                                if (currentlyExpanded) {
++                                    selectors.activeSelector = selector;
++                                    selectors.filterExpanded = true;
++                                } else {
++                                    selectors.filterExpanded = false;
++                                }
++                            }
++                            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)
++                        }
++                    }
++                }
++            }
++        }
++
++        MouseArea {
++            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-22 15:56:37 +0000
 +++ Components/Stage.qml	2013-11-15 17:29:44 +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-10-25 11:24:50 +0000
 +++ Dash/Dash.qml	2013-11-15 17:29:44 +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-21 08:15:28 +0000
 +++ Dash/DashContent.qml	2013-11-15 17:29:44 +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 ? item.previewShown : false
                  readonly property bool moving: item ? item.moving : false
++                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-11-08 03:10:09 +0000
 +++ Dash/GenericScopeView.qml	2013-11-15 17:29:44 +0000
@@ -22,6 +22,8 @@
  ScopeView {
      id: scopeView
      readonly property alias previewShown: previewListView.onScreen
++    property bool launcherShown
++    property alias filterSelectorVisible: pageHeader.filterSelectorVisible
      property bool enableHeightBehaviorOnNextCreation: false
      moving: categoryView.moving
@@ -248,6 +250,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-11-15 17:29:44 +0000
@@ -18,8 +18,11 @@
  import ListViewWithPageHeader 0.1
  ListViewWithPageHeader {
++    id: listView
++
      maximumFlickVelocity: height * 10
      flickDeceleration: height * 2
++    interactive: !pageHeader.filterSelectorVisible
      Connections {
          target: greeter
 === modified file 'Shell.qml'
 --- Shell.qml	2013-11-08 08:48:11 +0000
 +++ Shell.qml	2013-11-15 17:29:44 +0000
@@ -199,6 +199,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) {
@@ -298,8 +299,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
@@ -389,7 +389,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-11-15 17:29:44 +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-11-15 17:29:44 +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 {

Unity 8

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

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers