git.iko.soy/unity8
on xenial help sign in
Adapt to new TabBar
eeab218Albert Astals
qml/Dash/DashContent.qml+18−10
compare with xenial
unifiedsplit
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Unity 0.2
19import Unity 0.2
20+import Utils 0.1
20import "../Components"
21import "../Components"
21
22
22Item {
23Item {
@@ -188,23 +189,30 @@ Item {
188 width: parent.width
189 width: parent.width
189 style: DashContentTabBarStyle {}
190 style: DashContentTabBarStyle {}
190
191
191− model: dashContentList.model
192+ SortFilterProxyModel {
193+ id: tabBarModel
192
194
195+ model: dashContentList.model
196+
197+ property int selectedIndex: -1
193− onSelectedIndexChanged: {
198+ onSelectedIndexChanged: {
194− if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
199+ if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
195− // TODO This together with the Timer below
200+ // TODO This together with the Timer below
196− // are a workaround for the first tab sometimes not showing the text.
201+ // are a workaround for the first tab sometimes not showing the text.
197− // But Tabs are going away in the future so not sure if makes
202+ // But Tabs are going away in the future so not sure if makes
198− // sense invetigating what's the problem at this stage
203+ // sense invetigating what's the problem at this stage
199− selectionModeTimer.restart();
204+ selectionModeTimer.restart();
205+ }
206+ dashContentList.currentIndex = selectedIndex;
200 }
207 }
201− dashContentList.currentIndex = selectedIndex;
202 }
208 }
203
209
210+ model: tabBarModel.count > 0 ? tabBarModel : null
211+
204 Connections {
212 Connections {
205 target: dashContentList
213 target: dashContentList
206 onCurrentIndexChanged: {
214 onCurrentIndexChanged: {
207− tabBar.selectedIndex = dashContentList.currentIndex
215+ tabBarModel.selectedIndex = dashContentList.currentIndex
208 }
216 }
209 }
217 }
210
218