Unity 8

Merge lp:~aacid/unity8/dash_resizing_fixes into lp:unity8

dash_resizing_fixes
Merge into trunk

Proposed by Albert Astals Cid on 2016-02-09

Status:

Merged

Approved by:

Lukáš Tinkl on 2016-02-17

Approved revision:

2175

Merged at revision:

2228

Proposed branch:

lp:~aacid/unity8/dash_resizing_fixes

Merge into:

lp:unity8

Diff against target:

192 lines (+100/-11)

2 files modified

qml/Dash/Dash.qml (+11/-11)
tests/qmltests/Dash/tst_Dash.qml (+89/-0)

To merge this branch:

bzr merge lp:~aacid/unity8/dash_resizing_fixes

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-02-09	Approve on 2016-02-17
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-15
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-15
Michał Sawicz			Needs Fixing on 2016-02-11
Review via email: mp+285453@code.launchpad.net

Commit message

Fix resizing the dash bringing temp scopes size out of sync

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
No

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

* Did you make sure that your branch does not contain spurious tags?
Yes

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

* If you changed the UI, has there been a design review?
N/A

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-02-09:

LGTM, works fine here

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

Yes

* Did CI run pass? If not, please explain why.

Yes

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-02-11:

Go to Music scope → click on "New albums from 7digital" → WHITE

review: Needs Fixing

lp:~aacid/unity8/dash_resizing_fixes updated on 2016-02-15

2174. By Albert Astals Cid on 2016-02-15

Fix onOpenScope

2175. By Albert Astals Cid on 2016-02-15

Add a test for open scope

we didn't have it before and it would have caught the regression introduced by the first commit on this branch

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-02-15:

> Go to Music scope → click on "New albums from 7digital" → WHITE

Fixed and added a test that should pick it up next time if it breaks

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-02-17:

Re-tested, fixes both issues, tests passing

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

Yes

* Did CI run pass? If not, please explain why.

Yes

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

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:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/Dash.qml'
 --- qml/Dash/Dash.qml	2015-11-19 16:55:31 +0000
 +++ qml/Dash/Dash.qml	2016-02-15 10:15:31 +0000
@@ -37,6 +37,7 @@
+     }
      property bool windowActive: window.active
++    property bool showOverlayScope: false
      DashCommunicatorService {
          objectName: "dashCommunicatorService"
@@ -80,7 +81,7 @@
              return
+         }
--        closeOverlayScope();
++        dash.showOverlayScope = false;
          dashContent.closePreview();
@@ -93,12 +94,6 @@
          dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
+     }
--    function closeOverlayScope() {
--        if (dashContent.x != 0) {
--            dashContent.x = 0;
--        }
--    }
--
      Scopes {
          id: scopes
+     }
@@ -133,12 +128,13 @@
          height: dash.height
          scopes: scopes
          visible: x != -width
++        x: dash.showOverlayScope ? -width : 0
          onGotoScope: {
              dash.setCurrentScope(scopeId, true, false);
+         }
          onOpenScope: {
              scopeItem.scope = scope;
--            x = -width;
++            dash.showOverlayScope = true;
+         }
          Behavior on x {
              UbuntuNumberAnimation {
@@ -207,7 +203,7 @@
                  bottomEdgeController.enableAnimation = true;
                  bottomEdgeController.progress = 0;
                  scopeItem.scope = scope;
--                dashContent.x = -dashContent.width;
++                dash.showOverlayScope = true;
+             }
              onGotoScope: {
                  bottomEdgeController.enableAnimation = true;
@@ -226,7 +222,7 @@
          id: scopeItem
          objectName: "dashTempScopeItem"
--        x: dashContent.x + width
++        x: dash.showOverlayScope ? 0 : width
          y: dashContent.y
          width: parent.width
          height: parent.height
@@ -234,7 +230,7 @@
          hasBackAction: true
          isCurrent: visible
          onBackClicked: {
--            closeOverlayScope();
++            dash.showOverlayScope = false;
              closePreview();
+         }
@@ -250,6 +246,10 @@
                  scopes.closeScope(oldScope);
+             }
+         }
++
++        Behavior on x {
++            UbuntuNumberAnimation { }
++        }
+     }
      Rectangle {
 === modified file 'tests/qmltests/Dash/tst_Dash.qml'
 --- tests/qmltests/Dash/tst_Dash.qml	2015-12-11 09:10:01 +0000
 +++ tests/qmltests/Dash/tst_Dash.qml	2016-02-15 10:15:31 +0000
@@ -70,6 +70,42 @@
              waitForRendering(findChild(dash, "scopeLoader0").item);
+         }
++        function scrollToCategory(categoryName) {
++            var dashContentList = findChild(dash, "dashContentList");
++            var genericScopeView = dashContentList.currentItem;
++            var categoryListView = findChild(genericScopeView, "categoryListView");
++            tryCompareFunction(function() {
++                var category = findChild(genericScopeView, categoryName);
++                if (category && category.y > 0 && category.y < genericScopeView.height) return true;
++                touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
++                            genericScopeView.width/2, genericScopeView.y)
++                tryCompare(categoryListView, "moving", false);
++                return false;
++            }, true);
++
++            tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
++            return findChild(genericScopeView, categoryName);
++        }
++
++        function clickCategoryDelegate(category, delegate) {
++            var dashContentList = findChild(dash, "dashContentList");
++            var genericScopeView = dashContentList.currentItem;
++            if (category === undefined) category = 0;
++            if (delegate === undefined) delegate = 0;
++            tryCompareFunction(function() {
++                                    var cardGrid = findChild(genericScopeView, "dashCategory"+category);
++                                    if (cardGrid != null) {
++                                        var tile = findChild(cardGrid, "delegate"+delegate);
++                                        return tile != null;
++                                    }
++                                    return false;
++                                },
++                                true);
++            var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
++            waitForRendering(tile);
++            mouseClick(tile);
++        }
++
          function test_manage_dash_clickscope_unfavoritable() {
              // Show the manage dash
              touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
@@ -565,5 +601,58 @@
              tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);
              tryCompare(dashTempScopeItem, "visible", false);
+         }
++
++        function test_openScope()
++        {
++            scrollToCategory("dashCategory2");
++            clickCategoryDelegate(2, 2);
++
++            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
++            tryCompare(dashTempScopeItem, "x", 0);
++            tryCompare(dashTempScopeItem, "visible", true);
++            tryCompare(dashContent, "x", -dash.width);
++
++            // Go back
++            var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
++            var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
++            mouseClick(backButton);
++
++            // Check temp scope is gone
++            tryCompare(dashTempScopeItem, "x", dash.width);
++            tryCompare(dashTempScopeItem, "visible", false);
++            tryCompare(dashContent, "x", 0);
++        }
++
++        function test_tempScopeItemXOnResize()
++        {
++            // Go to a temp scope
++            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
++            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
++            tryCompare(bottomEdgeController, "progress", 1);
++            var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
++            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
++            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
++            mouseClick(nonfavScopesListCategoryList.currentItem);
++            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
++            tryCompare(dashTempScopeItem, "x", 0);
++            tryCompare(dashTempScopeItem, "visible", true);
++
++            shell.width = units.gu(80);
++            tryCompare(dashTempScopeItem, "x", 0);
++            tryCompare(dashContent, "x", -dash.width);
++
++            shell.width = units.gu(40);
++            tryCompare(dashTempScopeItem, "x", 0);
++
++            // Go back
++            var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
++            var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
++            mouseClick(backButton);
++
++            // Check temp scope is gone
++            tryCompare(dashTempScopeItem, "x", dash.width);
++            tryCompare(dashTempScopeItem, "visible", false);
++            tryCompare(dashContent, "x", 0);
++        }
+     }
+ }