git.iko.soy/unity8
on xenial help sign in
Close the popup correctly
180deecAlbert Astals
qml/Dash/Dash.qml−2
compare with xenial
unifiedsplit
@@ -170,7 +170,6 @@ Showable {
170 Connections {
170 Connections {
171 target: scopesList.scope
171 target: scopesList.scope
172 onOpenScope: {
172 onOpenScope: {
173− scopesList.closePopup();
174 bottomEdgeController.enableAnimation = true;
173 bottomEdgeController.enableAnimation = true;
175 bottomEdgeController.progress = 0;
174 bottomEdgeController.progress = 0;
176 scopeItem.scopeThatOpenedScope = scopesList.scope;
175 scopeItem.scopeThatOpenedScope = scopesList.scope;
@@ -178,7 +177,6 @@ Showable {
178 dashContent.x = -dashContent.width;
177 dashContent.x = -dashContent.width;
179 }
178 }
180 onGotoScope: {
179 onGotoScope: {
181− scopesList.closePopup();
182 bottomEdgeController.enableAnimation = true;
180 bottomEdgeController.enableAnimation = true;
183 bottomEdgeController.progress = 0;
181 bottomEdgeController.progress = 0;
184 dashContent.gotoScope(scopeId);
182 dashContent.gotoScope(scopeId);
qml/Dash/ScopesList.qml+1
@@ -87,6 +87,7 @@ Item {
87 }
87 }
88 }
88 }
89 onStoreClicked: root.storeClicked();
89 onStoreClicked: root.storeClicked();
90+ z: 1
90 }
91 }
91
92
92 Flickable {
93 Flickable {