0339f55 · unity8 · git.iko.soy

on xenial help sign in

make sure to close the search popup on going to other scopes

0339f55Albert Astals12 years ago

qml/Dash/Dash.qml+2

@@ -170,6 +170,7 @@ Showable {

170 Connections {

171 target: scopesList.scope

172 onOpenScope: {

173+ scopesList.closePopup();

173 bottomEdgeController.enableAnimation = true;

174 bottomEdgeController.enableAnimation = true;

174 bottomEdgeController.progress = 0;

175 bottomEdgeController.progress = 0;

175 scopeItem.scopeThatOpenedScope = scopesList.scope;

176 scopeItem.scopeThatOpenedScope = scopesList.scope;

@@ -177,6 +178,7 @@ Showable {

177 dashContent.x = -dashContent.width;

178 dashContent.x = -dashContent.width;

178 }

179 }

179 onGotoScope: {

180 onGotoScope: {

181+ scopesList.closePopup();

180 bottomEdgeController.enableAnimation = true;

182 bottomEdgeController.enableAnimation = true;

181 bottomEdgeController.progress = 0;

183 bottomEdgeController.progress = 0;

182 dashContent.gotoScope(scopeId);

184 dashContent.gotoScope(scopeId);

qml/Dash/ScopesList.qml+4

@@ -32,6 +32,10 @@ Item {

32 signal requestFavorite(string scopeId, bool favorite)

33 signal requestFavoriteMoveTo(string scopeId, int index)

35+ function closePopup() {

36+ header.closePopup();

37+ }

38+

35 state: "browse"

39 state: "browse"

37 onStateChanged: {

41 onStateChanged: {