git.iko.soy/unity8
on xenial help sign in
Fix resizing the dash bringing temp scopes size out of sync
c8b0b23Albert Astals Cid
qml/Dash/Dash.qml+10−10
compare with xenial
unifiedsplit
@@ -37,6 +37,7 @@ Showable {
37 }
37 }
38
38
39 property bool windowActive: window.active
39 property bool windowActive: window.active
40+ property bool showOverlayScope: false
40
41
41 DashCommunicatorService {
42 DashCommunicatorService {
42 objectName: "dashCommunicatorService"
43 objectName: "dashCommunicatorService"
@@ -80,7 +81,7 @@ Showable {
80 return
81 return
81 }
82 }
82
83
83− closeOverlayScope();
84+ dash.showOverlayScope = false;
84
85
85 dashContent.closePreview();
86 dashContent.closePreview();
86
87
@@ -93,12 +94,6 @@ Showable {
93 dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
94 dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
94 }
95 }
95
96
96− function closeOverlayScope() {
97− if (dashContent.x != 0) {
98− dashContent.x = 0;
99− }
100− }
101−
102 Scopes {
97 Scopes {
103 id: scopes
98 id: scopes
104 }
99 }
@@ -133,6 +128,7 @@ Showable {
133 height: dash.height
128 height: dash.height
134 scopes: scopes
129 scopes: scopes
135 visible: x != -width
130 visible: x != -width
131+ x: dash.showOverlayScope ? -width : 0
136 onGotoScope: {
132 onGotoScope: {
137 dash.setCurrentScope(scopeId, true, false);
133 dash.setCurrentScope(scopeId, true, false);
138 }
134 }
@@ -207,7 +203,7 @@ Showable {
207 bottomEdgeController.enableAnimation = true;
203 bottomEdgeController.enableAnimation = true;
208 bottomEdgeController.progress = 0;
204 bottomEdgeController.progress = 0;
209 scopeItem.scope = scope;
205 scopeItem.scope = scope;
210− dashContent.x = -dashContent.width;
206+ dash.showOverlayScope = true;
211 }
207 }
212 onGotoScope: {
208 onGotoScope: {
213 bottomEdgeController.enableAnimation = true;
209 bottomEdgeController.enableAnimation = true;
@@ -226,7 +222,7 @@ Showable {
226 id: scopeItem
222 id: scopeItem
227 objectName: "dashTempScopeItem"
223 objectName: "dashTempScopeItem"
228
224
229− x: dashContent.x + width
225+ x: dash.showOverlayScope ? 0 : width
230 y: dashContent.y
226 y: dashContent.y
231 width: parent.width
227 width: parent.width
232 height: parent.height
228 height: parent.height
@@ -234,7 +230,7 @@ Showable {
234 hasBackAction: true
230 hasBackAction: true
235 isCurrent: visible
231 isCurrent: visible
236 onBackClicked: {
232 onBackClicked: {
237− closeOverlayScope();
233+ dash.showOverlayScope = false;
238 closePreview();
234 closePreview();
239 }
235 }
240
236
@@ -250,6 +246,10 @@ Showable {
250 scopes.closeScope(oldScope);
246 scopes.closeScope(oldScope);
251 }
247 }
252 }
248 }
249+
250+ Behavior on x {
251+ UbuntuNumberAnimation { }
252+ }
253 }
253 }
254
254
255 Rectangle {
255 Rectangle {
tests/qmltests/Dash/tst_Dash.qml+30
@@ -565,5 +565,35 @@ Item {
565 tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);
565 tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);
566 tryCompare(dashTempScopeItem, "visible", false);
566 tryCompare(dashTempScopeItem, "visible", false);
567 }
567 }
568+
569+ function test_tempScopeItemXOnResize()
570+ {
571+ // Go to a temp scope
572+ touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
573+ var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
574+ tryCompare(bottomEdgeController, "progress", 1);
575+ var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
576+ var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
577+ tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
578+ mouseClick(nonfavScopesListCategoryList.currentItem);
579+ var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
580+ tryCompare(dashTempScopeItem, "x", 0);
581+ tryCompare(dashTempScopeItem, "visible", true);
582+
583+ shell.width = units.gu(80);
584+ tryCompare(dashTempScopeItem, "x", 0);
585+
586+ shell.width = units.gu(40);
587+ tryCompare(dashTempScopeItem, "x", 0);
588+
589+ // Go back
590+ var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
591+ var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
592+ mouseClick(backButton);
593+
594+ // Check temp scope is gone
595+ tryCompare(dashTempScopeItem, "x", dash.width);
596+ tryCompare(dashTempScopeItem, "visible", false);
597+ }
568 }
598 }
569}
599}