1
=== modified file 'qml/Dash/DashContent.qml'
2
--- qml/Dash/DashContent.qml	2014-03-17 11:44:05 +0000
3
+++ qml/Dash/DashContent.qml	2014-03-25 09:18:56 +0000
4
@@ -17,6 +17,7 @@
5
17
import QtQuick 2.0
17
import QtQuick 2.0
6
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
7
19
import Unity 0.2
19
import Unity 0.2
8
20
import Utils 0.1
9
20
import "../Components"
21
import "../Components"
10
21
22
11
22
Item {
23
Item {
12
@@ -188,23 +189,30 @@
13
188
                width: parent.width
189
                width: parent.width
14
189
                style: DashContentTabBarStyle {}
190
                style: DashContentTabBarStyle {}
15
190
191
25
191
                model: dashContentList.model
192
                SortFilterProxyModel {
26
192
193
                    id: tabBarModel
27
193
                onSelectedIndexChanged: {
194
28
194
                    if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
195
                    model: dashContentList.model
29
195
                        // TODO This together with the Timer below
196
30
196
                        // are a workaround for the first tab sometimes not showing the text.
197
                    property int selectedIndex: -1
31
197
                        // But Tabs are going away in the future so not sure if makes
198
                    onSelectedIndexChanged: {
32
198
                        // sense invetigating what's the problem at this stage
199
                        if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
33
199
                        selectionModeTimer.restart();
200
                            // TODO This together with the Timer below
34
201
                            // are a workaround for the first tab sometimes not showing the text.
35
202
                            // But Tabs are going away in the future so not sure if makes
36
203
                            // sense invetigating what's the problem at this stage
37
204
                            selectionModeTimer.restart();
38
205
                        }
39
206
                        dashContentList.currentIndex = selectedIndex;
40
200
                    }
207
                    }
41
201
                    dashContentList.currentIndex = selectedIndex;
42
202
                }
208
                }
43
203
209
44
210
                model: tabBarModel.count > 0 ? tabBarModel : null
45
211
46
204
                Connections {
212
                Connections {
47
205
                    target: dashContentList
213
                    target: dashContentList
48
206
                    onCurrentIndexChanged: {
214
                    onCurrentIndexChanged: {
50
207
                        tabBar.selectedIndex = dashContentList.currentIndex
215
                        tabBarModel.selectedIndex = dashContentList.currentIndex
51
208
                    }
216
                    }
52
209
                }
217
                }
53
210
218
Status:	Merged
Approved by:	Andrea Cimitan on 2014-04-07
Approved revision:	761
Merged at revision:	820
Proposed branch:	lp:~aacid/unity8/new_tabbar
Merge into:	lp:unity8
Diff against target:	52 lines (+19/-11) 1 file modified qml/Dash/DashContent.qml (+19/-11)
To merge this branch:	bzr merge lp:~aacid/unity8/new_tabbar
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)			Approve on 2014-04-07
Tim Peeters (community)		2014-03-11	Approve on 2014-04-04
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-03-25
Review via email: mp+210453@code.launchpad.net
1	=== modified file 'qml/Dash/DashContent.qml'
2	--- qml/Dash/DashContent.qml 2014-03-17 11:44:05 +0000
3	+++ qml/Dash/DashContent.qml 2014-03-25 09:18:56 +0000
4	@@ -17,6 +17,7 @@
5	17	import QtQuick 2.0	17	import QtQuick 2.0
6	18	import Ubuntu.Components 0.1	18	import Ubuntu.Components 0.1
7	19	import Unity 0.2	19	import Unity 0.2
8			20	import Utils 0.1
9	20	import "../Components"	21	import "../Components"
10	21		22
11	22	Item {	23	Item {
12	@@ -188,23 +189,30 @@
13	188	width: parent.width	189	width: parent.width
14	189	style: DashContentTabBarStyle {}	190	style: DashContentTabBarStyle {}
15	190		191
25	191	model: dashContentList.model	192	SortFilterProxyModel {
26	192		193	id: tabBarModel
27	193	onSelectedIndexChanged: {	194
28	194	if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {	195	model: dashContentList.model
29	195	// TODO This together with the Timer below	196
30	196	// are a workaround for the first tab sometimes not showing the text.	197	property int selectedIndex: -1
31	197	// But Tabs are going away in the future so not sure if makes	198	onSelectedIndexChanged: {
32	198	// sense invetigating what's the problem at this stage	199	if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
33	199	selectionModeTimer.restart();	200	// TODO This together with the Timer below
34			201	// are a workaround for the first tab sometimes not showing the text.
35			202	// But Tabs are going away in the future so not sure if makes
36			203	// sense invetigating what's the problem at this stage
37			204	selectionModeTimer.restart();
38			205	}
39			206	dashContentList.currentIndex = selectedIndex;
40	200	}	207	}
41	201	dashContentList.currentIndex = selectedIndex;
42	202	}	208	}
43	203		209
44			210	model: tabBarModel.count > 0 ? tabBarModel : null
45			211
46	204	Connections {	212	Connections {
47	205	target: dashContentList	213	target: dashContentList
48	206	onCurrentIndexChanged: {	214	onCurrentIndexChanged: {
50	207	tabBar.selectedIndex = dashContentList.currentIndex	215	tabBarModel.selectedIndex = dashContentList.currentIndex
51	208	}	216	}
52	209	}	217	}
53	210		218