5a2dcf2 · unity8 · git.iko.soy

git.iko.soy/unity8

If you select a favorite in All, go back to Dash not to temp scope

commit5a2dcf26bc2745f53c6b9515489c20d618c9eb8a authorAlbert Astals <albert.astals@canonical.com> dateTue 15 Jul 2014, 16:39 (12 years ago) parentd584d6a

9 files changed+46−19

compare with xenial

unifiedsplit

qml/Dash/CardCarousel.qml+1−1 qml/Dash/CardFilterGrid.qml+1−1 qml/Dash/CardVerticalJournal.qml+1−1 qml/Dash/Dash.qml+16−9 qml/Dash/DashRenderer.qml+2−1 qml/Dash/ScopesOverview.qml+12−4 qml/Dash/ScopesOverviewAll.qml+2−2 tests/mocks/Unity/fake_scopesoverview.cpp+10 tests/mocks/Unity/fake_scopesoverview.h+1

qml/Dash/CardCarousel.qml+1−1

@@ -53,7 +53,7 @@ DashRenderer {

5353

5454 objectName: "carouselDelegate" + index

5555

56− function clicked() { cardCarousel.clicked(index, model.result, loader.item) }

56+ function clicked() { cardCarousel.clicked(index, model.result, loader.item, model) }

5757 function pressAndHold() { cardCarousel.pressAndHold(index, model.result) }

5858

5959 sourceComponent: cardTool.cardComponent

qml/Dash/CardFilterGrid.qml+1−1

@@ -74,7 +74,7 @@ DashRenderer {

7474 }

7575 Connections {

7676 target: loader.item

77− onClicked: genericFilterGrid.clicked(index, result, loader.item)

77+ onClicked: genericFilterGrid.clicked(index, result, loader.item, model)

7878 onPressAndHold: genericFilterGrid.pressAndHold(index)

7979 }

8080 }

qml/Dash/CardVerticalJournal.qml+1−1

@@ -79,7 +79,7 @@ DashRenderer {

7979 }

8080 Connections {

8181 target: loader.item

82− onClicked: root.clicked(index, result, loader.item)

82+ onClicked: root.clicked(index, result, loader.item, model)

8383 onPressAndHold: root.pressAndHold(index)

8484 }

8585 }

qml/Dash/Dash.qml+16−9

@@ -99,15 +99,7 @@ Showable {

9999 currentIndex: dashContent.currentIndex

100100 onDone: {

101101 if (dashContent.parent == scopesOverviewXYScaler) {

102− // Animate Dash growing from the All screen

103− var currentScopePos = scopesOverview.allScopeCardPosition(dashContent.currentScopeId);

104− scopesOverviewXYScaler.scale = scopesOverview.allCardSize.width / scopesOverviewXYScaler.width;

105− scopesOverviewXYScaler.x = currentScopePos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;

106− scopesOverviewXYScaler.y = currentScopePos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;

107− overviewController.growingDashFromAll = true;

108− scopesOverviewXYScaler.scale = 1;

109− scopesOverviewXYScaler.x = 0;

110− scopesOverviewXYScaler.y = 0;

102+ animateDashFromAll();

111103 }

112104 hide();

113105 }

@@ -115,11 +107,26 @@ Showable {

115107 dashContent.setCurrentScopeAtIndex(index, false, false);

116108 hide();

117109 }

110+ onAllFavoriteSelected: {

111+ setCurrentScope(scopeId, false, false);

112+ animateDashFromAll();

113+ hide();

114+ }

118115 function hide() {

119116 overviewController.enableAnimation = true;

120117 overviewController.progress = 0;

121118 overviewController.accepted = false;

122119 }

120+ function animateDashFromAll() {

121+ var currentScopePos = scopesOverview.allScopeCardPosition(dashContent.currentScopeId);

122+ scopesOverviewXYScaler.scale = scopesOverview.allCardSize.width / scopesOverviewXYScaler.width;

123+ scopesOverviewXYScaler.x = currentScopePos.x -(scopesOverviewXYScaler.width - scopesOverviewXYScaler.width * scopesOverviewXYScaler.scale) / 2;

124+ scopesOverviewXYScaler.y = currentScopePos.y -(scopesOverviewXYScaler.height - scopesOverviewXYScaler.height * scopesOverviewXYScaler.scale) / 2;

125+ overviewController.growingDashFromAll = true;

126+ scopesOverviewXYScaler.scale = 1;

127+ scopesOverviewXYScaler.x = 0;

128+ scopesOverviewXYScaler.y = 0;

129+ }

123130

124131 Connections {

125132 target: scopesOverview.scope

qml/Dash/DashRenderer.qml+2−1

@@ -46,7 +46,8 @@ Item {

4646 /// @param index is the index of the clicked item

4747 /// @param result result model of the cliked item, used for activation

4848 /// @param item item that has been clicked

49− signal clicked(int index, var result, var item)

49+ /// @param itemModel model of the item

50+ signal clicked(int index, var result, var item, var itemModel)

5051

5152 /// Emitted when the user pressed and held on an item

5253 /// @param index is the index of the held item

qml/Dash/ScopesOverview.qml+12−4

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

5151

5252 signal done()

5353 signal favoriteSelected(int index)

54+ signal allFavoriteSelected(var scopeId)

5455 signal allSelected(var scope)

5556

5657 function allScopeCardPosition(scopeId) {

@@ -214,10 +215,17 @@ Item {

214215 if (tabBarHolder.currentTab == 0) {

215216 root.favoriteSelected(index)

216217 } else {

217− // This will result in an openScope

218− // that we handle in Dash.qml

219− root.allScopeClickedPos = item.mapToItem(null, 0, 0);

220− scope.activate(result);

218+ var favoriteScopesItem = middleItems.itemAt(0).item;

219+ var index = favoriteScopesItem.model.scopeIndex(itemModel.scopeId);

220+ if (index > 0) {

221+ root.allFavoriteSelected(itemModel.scopeId);

222+ } else {

223+ // This will result in an openScope

224+ // that we handle in Dash.qml

225+ // TODO use and not do the openScope thing Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(const QString& scope_id) const override;

226+ root.allScopeClickedPos = item.mapToItem(null, 0, 0);

227+ scope.activate(result);

228+ }

221229 }

222230 }

223231 onPressAndHold: {

qml/Dash/ScopesOverviewAll.qml+2−2

@@ -25,7 +25,7 @@ Flickable {

2525

2626 property real extraHeight: 0

2727

28− signal clicked(int index, var result, var item)

28+ signal clicked(int index, var result, var item, var itemModel)

2929 signal pressAndHold(int index)

3030

3131 contentHeight: cardFilterGrid.height + extraHeight

@@ -47,7 +47,7 @@ Flickable {

4747 }

4848

4949 onClicked: {

50− root.clicked(index, result, item);

50+ root.clicked(index, result, item, itemModel);

5151 }

5252 onPressAndHold: {

5353 root.pressAndHold(index);

tests/mocks/Unity/fake_scopesoverview.cpp+10

@@ -135,6 +135,13 @@ int ScopesOverviewResultsModel::scopeIndex(QString const& id) const

135135 return -1;

136136}

137137

138+QHash<int, QByteArray> ScopesOverviewResultsModel::roleNames() const

139+{

140+ QHash<int, QByteArray> roles = unity::shell::scopes::ResultsModelInterface::roleNames();

141+ roles[RoleBackground + 1] = "scopeId";

142+ return roles;

143+}

144+

138145int ScopesOverviewResultsModel::rowCount(const QModelIndex& parent) const

139146{

140147 Q_UNUSED(parent);

@@ -164,6 +171,9 @@ ScopesOverviewResultsModel::data(const QModelIndex& index, int role) const

164171 case RoleMascot:

165172 case RoleEmblem:

166173 case RoleSummary:

174+ case RoleBackground + 1: // scopeId

175+ return m_scopes->scopeAt(index.row(), m_isFavoriteCategory)->id();

176+ break;

167177 default:

168178 return QVariant();

169179 }

tests/mocks/Unity/fake_scopesoverview.h+1

@@ -70,6 +70,7 @@ public:

7070

7171 /* Special API */

7272 Q_INVOKABLE int scopeIndex(QString const& id) const;

73+ QHash<int, QByteArray> roleNames() const override;

7374

7475private:

7576 Scopes *m_scopes;