079da03 · unity8 · git.iko.soy

qml/Dash/Dash.qml+5

compare with xenial

unifiedsplit

@@ -187,6 +187,11 @@ Showable {

187 onRequestFavoriteMoveTo: {

188 scopes.moveFavoriteTo(scopeId, index);

189 }

190+ onRequestRestore: {

191+ bottomEdgeController.enableAnimation = true;

192+ bottomEdgeController.progress = 0;

193+ dash.setCurrentScope(scopeId, false, false);

194+ }

190

195

191 Binding {

196 Binding {

192 target: scopesList.scope

197 target: scopesList.scope

qml/Dash/ScopesList.qml+2

@@ -31,6 +31,7 @@ Item {

31 signal storeClicked()

32 signal requestFavorite(string scopeId, bool favorite)

33 signal requestFavoriteMoveTo(string scopeId, int index)

34+ signal requestRestore(string scopeId)

34

35

35 state: "browse"

36 state: "browse"

36

37

@@ -124,6 +125,7 @@ Item {

124 onRequestEditMode: root.state = "edit";

125 onRequestEditMode: root.state = "edit";

125 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);

126 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);

126 onRequestActivate: root.scope.activate(result);

127 onRequestActivate: root.scope.activate(result);

128+ onRequestRestore: root.requestRestore(scopeId);

127 }

129 }

128 }

130 }

129 }

131 }

qml/Dash/ScopesListCategory.qml+5−1

@@ -35,6 +35,7 @@ Item {

35 signal requestEditMode()

36 signal requestScopeMoveTo(string scopeId, int index)

37 signal requestActivate(var result)

38+ signal requestRestore(string scopeId)

38

39

39 implicitHeight: visible ? childrenRect.height : 0

40 implicitHeight: visible ? childrenRect.height : 0

40

41

@@ -93,7 +94,10 @@ Item {

93

94

94 onClicked: {

95 onClicked: {

95 if (!editMode) {

96 if (!editMode) {

97+ if (root.isFavoritesFeed)

98+ root.requestRestore(model.scopeId);

99+ else

96− root.requestActivate(result);

100+ root.requestActivate(result);

97 }

101 }

98 }

102 }

99 onPressAndHold: {

103 onPressAndHold: {