6fe575f · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

bind current item

6fe575fAlbert Astals12 years ago

qml/Dash/Dash.qml+1

compare with xenial

unifiedsplit

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

93 progress: overviewController.progress

94 scopeScale: 1 - overviewController.progress * 0.6

95 visible: scopeScale != 1

96+ currentIndex: dashContent.currentIndex

96 onDone: hide();

97 onDone: hide();

97 onFavoriteSelected: {

98 onFavoriteSelected: {

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

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

qml/Dash/ScopesOverview.qml+9−1

@@ -26,7 +26,14 @@ Item {

26 // TODO This needs to account for when all is the current item

27 // And All needs a currentItem concept

28 // TODO we also need a centered item so when we click done from all the item grows from the middle: think

29− property var dashItemEater: middleItems.count > 1 ? middleItems.itemAt(0).item.currentItem.item : null

29+ property var dashItemEater: {

30+ if (middleItems.count > tabBarHolder.currentTab) {

31+ var loader = middleItems.itemAt(tabBarHolder.currentTab).item;

32+ return loader && loader.currentItem ? loader.currentItem.item : null;

33+ }

34+ return null;

35+ }

36+ property int currentIndex: 0

30 property real scopeScale: 1

37 property real scopeScale: 1

31 property QtObject scopeStyle: QtObject {

38 property QtObject scopeStyle: QtObject {

32 property string headerLogo: ""

39 property string headerLogo: ""

@@ -211,6 +218,7 @@ Item {

211 item.scopeWidth = root.width;

218 item.scopeWidth = root.width;

212 item.scopeHeight = root.height;

219 item.scopeHeight = root.height;

213 item.appliedScale = Qt.binding(function() { return loader.scale })

220 item.appliedScale = Qt.binding(function() { return loader.scale })

221+ item.currentIndex = Qt.binding(function() { return root.currentIndex }) // TODO Move down

214 } else if (index == 1) {

222 } else if (index == 1) {

215 item.extraHeight = bottomBar.height;

223 item.extraHeight = bottomBar.height;

216 }

224 }