@@ -17,7 +17,6 @@
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919import Unity 0.2
20−import Utils 0.1
2120import "../Components"
2221
2322Item {
@@ -189,30 +188,23 @@ Item {
189188 width: parent.width
190189 style: DashContentTabBarStyle {}
191190
192− SortFilterProxyModel {
193− id: tabBarModel
191+ model: dashContentList.model
194192
195− model: dashContentList.model
196−
197− property int selectedIndex: -1
198− onSelectedIndexChanged: {
199− if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
200− // TODO This together with the Timer below
201− // are a workaround for the first tab sometimes not showing the text.
202− // But Tabs are going away in the future so not sure if makes
203− // sense invetigating what's the problem at this stage
204− selectionModeTimer.restart();
205− }
206− dashContentList.currentIndex = selectedIndex;
193+ onSelectedIndexChanged: {
194+ if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
195+ // TODO This together with the Timer below
196+ // 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
198+ // sense invetigating what's the problem at this stage
199+ selectionModeTimer.restart();
207200 }
201+ dashContentList.currentIndex = selectedIndex;
208202 }
209203
210− model: tabBarModel.count > 0 ? tabBarModel : null
211−
212204 Connections {
213205 target: dashContentList
214206 onCurrentIndexChanged: {
215− tabBarModel.selectedIndex = dashContentList.currentIndex
207+ tabBar.selectedIndex = dashContentList.currentIndex
216208 }
217209 }
218210