git.iko.soy/unity8
on xenial help sign in
Fix flickable speed to be resolution independent, by subclassing components Fixes: 1348557
9f68029Andrea Cimitan
qml/Components/Carousel.qml+2−3
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 "carousel.js" as CarouselJS
19import "carousel.js" as CarouselJS
20+import "Flickables" as Flickables
20
21
21/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
22/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
22 cover flow. But it stops at it's boundaries (therefore no PathView is used).
23 cover flow. But it stops at it's boundaries (therefore no PathView is used).
@@ -63,7 +64,7 @@ Item {
63 and footer item to compensate that.
64 and footer item to compensate that.
64
65
65 The scaling of the items is controlled by the variable continuousIndex, described below. */
66 The scaling of the items is controlled by the variable continuousIndex, described below. */
66− ListView {
67+ Flickables.ListView {
67 id: listView
68 id: listView
68 objectName: "listView"
69 objectName: "listView"
69
70
@@ -135,8 +136,6 @@ Item {
135
136
136 boundsBehavior: Flickable.DragOverBounds
137 boundsBehavior: Flickable.DragOverBounds
137 cacheBuffer: carousel.cacheBuffer
138 cacheBuffer: carousel.cacheBuffer
138− flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default
139− maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
140 orientation: ListView.Horizontal
139 orientation: ListView.Horizontal
141
140
142 function getXFromContinuousIndex(index) {
141 function getXFromContinuousIndex(index) {
qml/Components/Flickables/Flickable.qmlnew file+23
@@ -0,0 +1,23 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3 as QtQuick
18+import Ubuntu.Components 1.1
19+
20+QtQuick.Flickable {
21+ flickDeceleration: 1500 * units.gridUnit / 8
22+ maximumFlickVelocity: 2500 * units.gridUnit / 8
23+}
qml/Components/Flickables/GridView.qmlnew file+25
@@ -0,0 +1,25 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3 as QtQuick
18+import Ubuntu.Components 1.1
19+
20+QtQuick.GridView {
21+ // Attached components and usages like GridView.onRemove are known not to work
22+ // please use GridView directly from QtQuick if needed
23+ flickDeceleration: 1500 * units.gridUnit / 8
24+ maximumFlickVelocity: 2500 * units.gridUnit / 8
25+}
qml/Components/Flickables/ListView.qmlnew file+25
@@ -0,0 +1,25 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3 as QtQuick
18+import Ubuntu.Components 1.1
19+
20+QtQuick.ListView {
21+ // Attached components and usages like ListView.onRemove are known not to work
22+ // please use ListView directly from QtQuick if needed
23+ flickDeceleration: 1500 * units.gridUnit / 8
24+ maximumFlickVelocity: 2500 * units.gridUnit / 8
25+}
qml/Components/Flickables/ListViewWithPageHeader.qmlnew file+23
@@ -0,0 +1,23 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import Dash 0.1
18+import Ubuntu.Components 1.1
19+
20+ListViewWithPageHeader {
21+ flickDeceleration: 1500 * units.gridUnit / 8
22+ maximumFlickVelocity: 2500 * units.gridUnit / 8
23+}
qml/Components/ResponsiveGridView.qml+2−1
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import "Flickables" as Flickables
19
20
20/*
21/*
21 Essentially a GridView where you can specify the maximum number of columns it can have.
22 Essentially a GridView where you can specify the maximum number of columns it can have.
@@ -55,7 +56,7 @@ Item {
55 return rows * height
56 return rows * height
56 }
57 }
57
58
58− GridView {
59+ Flickables.GridView {
59 id: gridView
60 id: gridView
60 objectName: "responsiveGridViewGrid"
61 objectName: "responsiveGridViewGrid"
61 anchors {
62 anchors {
qml/Components/ZoomableImage.qml+2−2
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import "../Components"
19+import "Flickables" as Flickables
20
20
21/*! \brief Zoomable for image.
21/*! \brief Zoomable for image.
22
22
@@ -32,7 +32,7 @@ Item {
32 property alias scaleTo: lazyImage.scaleTo
32 property alias scaleTo: lazyImage.scaleTo
33 property alias asynchronous: lazyImage.asynchronous
33 property alias asynchronous: lazyImage.asynchronous
34
34
35− Flickable {
35+ Flickables.Flickable {
36 id: flickable
36 id: flickable
37 objectName: "flickable"
37 objectName: "flickable"
38 clip: true
38 clip: true
qml/Dash/CardHorizontalList.qml+2−1
@@ -17,6 +17,7 @@
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../Components"
19import "../Components"
20+import "../Components/Flickables" as Flickables
20
21
21DashRenderer {
22DashRenderer {
22 id: root
23 id: root
@@ -25,7 +26,7 @@ DashRenderer {
25 collapsedHeight: expandedHeight
26 collapsedHeight: expandedHeight
26 clip: true
27 clip: true
27
28
28− ListView {
29+ Flickables.ListView {
29 id: listView
30 id: listView
30 anchors {
31 anchors {
31 fill: parent
32 fill: parent
qml/Dash/DashContent.qml+2−3
@@ -19,6 +19,7 @@ import Ubuntu.Components 0.1
19import Unity 0.2
19import Unity 0.2
20import Utils 0.1
20import Utils 0.1
21import "../Components"
21import "../Components"
22+import "../Components/Flickables" as Flickables
22
23
23Item {
24Item {
24 id: dashContent
25 id: dashContent
@@ -97,7 +98,7 @@ Item {
97 anchors.fill: parent
98 anchors.fill: parent
98 }
99 }
99
100
100− ListView {
101+ Flickables.ListView {
101 id: dashContentList
102 id: dashContentList
102 objectName: "dashContentList"
103 objectName: "dashContentList"
103
104
@@ -105,8 +106,6 @@ Item {
105 anchors.fill: parent
106 anchors.fill: parent
106 orientation: ListView.Horizontal
107 orientation: ListView.Horizontal
107 boundsBehavior: Flickable.DragAndOvershootBounds
108 boundsBehavior: Flickable.DragAndOvershootBounds
108− flickDeceleration: units.gu(625)
109− maximumFlickVelocity: width * 5
110 snapMode: ListView.SnapOneItem
109 snapMode: ListView.SnapOneItem
111 highlightMoveDuration: 250
110 highlightMoveDuration: 250
112 highlightRangeMode: ListView.StrictlyEnforceRange
111 highlightRangeMode: ListView.StrictlyEnforceRange
qml/Dash/DashNavigationButton.qml+2−1
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19+import "../Components/Flickables" as Flickables
19
20
20AbstractButton {
21AbstractButton {
21 id: root
22 id: root
@@ -75,7 +76,7 @@ AbstractButton {
75 }
76 }
76
77
77 // navigationListView is outside root
78 // navigationListView is outside root
78− ListView {
79+ Flickables.ListView {
79 id: navigationListView
80 id: navigationListView
80 objectName: "navigationListView"
81 objectName: "navigationListView"
81 visible: height > 0
82 visible: height > 0
qml/Dash/DashNavigationList.qml+2−1
@@ -17,6 +17,7 @@
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../Components"
19import "../Components"
20+import "../Components/Flickables" as Flickables
20
21
21Item {
22Item {
22 id: root
23 id: root
@@ -45,7 +46,7 @@ Item {
45 }
46 }
46 }
47 }
47
48
48− Flickable {
49+ Flickables.Flickable {
49 id: flickable
50 id: flickable
50
51
51 anchors.fill: parent
52 anchors.fill: parent
qml/Dash/PageHeader.qml+2−1
@@ -21,6 +21,7 @@ import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0
21import Ubuntu.Components.ListItems 1.0
22import "../Components"
22import "../Components"
23import "../Components/SearchHistoryModel"
23import "../Components/SearchHistoryModel"
24+import "../Components/Flickables" as Flickables
24
25
25Item {
26Item {
26 id: root
27 id: root
@@ -127,7 +128,7 @@ Item {
127 }
128 }
128 }
129 }
129
130
130− Flickable {
131+ Flickables.Flickable {
131 id: headerContainer
132 id: headerContainer
132 objectName: "headerContainer"
133 objectName: "headerContainer"
133 clip: contentY < height
134 clip: contentY < height
qml/Dash/PreviewListView.qml+2−3
@@ -18,6 +18,7 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Unity 0.2
19import Unity 0.2
20import "../Components"
20import "../Components"
21+import "../Components/Flickables" as Flickables
21import "Previews" as Previews
22import "Previews" as Previews
22
23
23Item {
24Item {
@@ -52,7 +53,7 @@ Item {
52 onBackClicked: root.backClicked()
53 onBackClicked: root.backClicked()
53 }
54 }
54
55
55− ListView {
56+ Flickables.ListView {
56 id: previewListView
57 id: previewListView
57 objectName: "listView"
58 objectName: "listView"
58 anchors {
59 anchors {
@@ -66,8 +67,6 @@ Item {
66 snapMode: ListView.SnapOneItem
67 snapMode: ListView.SnapOneItem
67 boundsBehavior: Flickable.DragAndOvershootBounds
68 boundsBehavior: Flickable.DragAndOvershootBounds
68 highlightMoveDuration: 250
69 highlightMoveDuration: 250
69− flickDeceleration: units.gu(625)
70− maximumFlickVelocity: width * 5
71 cacheBuffer: 0
70 cacheBuffer: 0
72
71
73 property bool open: false
72 property bool open: false
qml/Dash/Previews/Preview.qml+2−1
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import "../../Components/Flickables" as Flickables
19
20
20/*! \brief This component constructs the Preview UI.
21/*! \brief This component constructs the Preview UI.
21 *
22 *
@@ -63,7 +64,7 @@ Item {
63 Repeater {
64 Repeater {
64 model: previewModel
65 model: previewModel
65
66
66− delegate: ListView {
67+ delegate: Flickables.ListView {
67 id: column
68 id: column
68 anchors { top: parent.top; bottom: parent.bottom }
69 anchors { top: parent.top; bottom: parent.bottom }
69 width: row.columnWidth
70 width: row.columnWidth
qml/Dash/Previews/PreviewImageGallery.qml+3−2
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../../Components"
19import "../../Components"
20+import "../../Components/Flickables" as Flickables
20
21
21/*! This preview widget shows a horizontal list of images.
22/*! This preview widget shows a horizontal list of images.
22 * The URIs for the images should be an array in widgetData["sources"].
23 * The URIs for the images should be an array in widgetData["sources"].
@@ -28,7 +29,7 @@ PreviewWidget {
28
29
29 property Item rootItem: QuickUtils.rootItem(root)
30 property Item rootItem: QuickUtils.rootItem(root)
30
31
31− ListView {
32+ Flickables.ListView {
32 id: previewImageListView
33 id: previewImageListView
33 objectName: "previewImageListView"
34 objectName: "previewImageListView"
34 spacing: units.gu(1)
35 spacing: units.gu(1)
@@ -102,7 +103,7 @@ PreviewWidget {
102 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
103 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
103 }
104 }
104
105
105− ListView {
106+ Flickables.ListView {
106 id: slideShowListView
107 id: slideShowListView
107 objectName: "slideShowListView"
108 objectName: "slideShowListView"
108 anchors.fill: parent
109 anchors.fill: parent
qml/Dash/ScopeListView.qml+3−6
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,11 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import "../Components/Flickables" as Flickables
18−import Dash 0.1
19
18
20−ListViewWithPageHeader {
19+Flickables.ListViewWithPageHeader {
21− maximumFlickVelocity: height * 10
22− flickDeceleration: height * 2
23 cacheBuffer: Number.MAX_VALUE
20 cacheBuffer: Number.MAX_VALUE
24}
21}
qml/Dash/ScopeSettingsPage.qml+2−1
@@ -18,6 +18,7 @@ import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import Unity 0.2
19import Unity 0.2
20import "../Components"
20import "../Components"
21+import "../Components/Flickables" as Flickables
21import "ScopeSettings"
22import "ScopeSettings"
22
23
23Item {
24Item {
@@ -39,7 +40,7 @@ Item {
39 onBackClicked: root.backClicked()
40 onBackClicked: root.backClicked()
40 }
41 }
41
42
42− ListView {
43+ Flickables.ListView {
43 id: scopeSettings
44 id: scopeSettings
44 objectName: "scopeSettings"
45 objectName: "scopeSettings"
45 anchors {
46 anchors {
qml/Dash/ScopesOverviewAll.qml+2−1
@@ -16,8 +16,9 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import "../Components/Flickables" as Flickables
19
20
20−Flickable {
21+Flickables.Flickable {
21 id: root
22 id: root
22
23
23 property alias model: cardGrid.model
24 property alias model: cardGrid.model
qml/Dash/ScopesOverviewFavorites.qml+4−2
@@ -14,9 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.3
18+import Ubuntu.Components 1.1
19+import "../Components/Flickables" as Flickables
18
20
19−Flickable {
21+Flickables.Flickable {
20 id: root
22 id: root
21
23
22 signal clicked(int index, var result, var itemModel)
24 signal clicked(int index, var result, var itemModel)
qml/Greeter/LoginList.qml+2−2
@@ -18,6 +18,7 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import LightDM 0.1 as LightDM
19import LightDM 0.1 as LightDM
20import "../Components"
20import "../Components"
21+import "../Components/Flickables" as Flickables
21
22
22Item {
23Item {
23 id: root
24 id: root
@@ -68,7 +69,7 @@ Item {
68 antialiasing: true
69 antialiasing: true
69 }
70 }
70
71
71− ListView {
72+ Flickables.ListView {
72 id: userList
73 id: userList
73 objectName: "userList"
74 objectName: "userList"
74
75
@@ -78,7 +79,6 @@ Item {
78 preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
79 preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
79 highlightRangeMode: ListView.StrictlyEnforceRange
80 highlightRangeMode: ListView.StrictlyEnforceRange
80 highlightMoveDuration: root.moveDuration
81 highlightMoveDuration: root.moveDuration
81− flickDeceleration: 10000
82
82
83 readonly property bool movingInternally: moveTimer.running || userList.moving
83 readonly property bool movingInternally: moveTimer.running || userList.moving
84
84
qml/Hud/Hud.qml+2−1
@@ -19,6 +19,7 @@ import Ubuntu.Components 0.1
19import HudClient 0.1
19import HudClient 0.1
20
20
21import "../Components"
21import "../Components"
22+import "../Components/Flickables" as Flickables
22
23
23Item {
24Item {
24 id: hud
25 id: hud
@@ -400,7 +401,7 @@ Item {
400 }
401 }
401 progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)
402 progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)
402
403
403− Flickable {
404+ Flickables.Flickable {
404 anchors.left: parent.left
405 anchors.left: parent.left
405 anchors.right: parent.right
406 anchors.right: parent.right
406 contentHeight: resultList.height
407 contentHeight: resultList.height
qml/Hud/HudParametrizedActionsPage.qml+2−1
@@ -18,6 +18,7 @@ import QtQuick 2.0
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
20import "../Components"
20import "../Components"
21+import "../Components/Flickables" as Flickables
21
22
22Item {
23Item {
23 property alias header: header.title
24 property alias header: header.title
@@ -74,7 +75,7 @@ Item {
74 return values
75 return values
75 }
76 }
76
77
77− Flickable {
78+ Flickables.Flickable {
78 anchors.top: parent.top
79 anchors.top: parent.top
79 anchors.bottom: buttons.top
80 anchors.bottom: buttons.top
80 anchors.left: parent.left
81 anchors.left: parent.left
qml/Launcher/LauncherPanel.qml+2−1
@@ -21,6 +21,7 @@ import Unity.Launcher 0.1
21import Ubuntu.Components.Popups 0.1
21import Ubuntu.Components.Popups 0.1
22import "../Components/ListItems"
22import "../Components/ListItems"
23import "../Components/"
23import "../Components/"
24+import "../Components/Flickables" as Flickables
24
25
25Rectangle {
26Rectangle {
26 id: root
27 id: root
@@ -74,7 +75,7 @@ Rectangle {
74 anchors.fill: parent
75 anchors.fill: parent
75 clip: true
76 clip: true
76
77
77− ListView {
78+ Flickables.ListView {
78 id: launcherListView
79 id: launcherListView
79 objectName: "launcherListView"
80 objectName: "launcherListView"
80 anchors {
81 anchors {
qml/Notifications/Notification.qml+2−1
@@ -20,6 +20,7 @@ import Ubuntu.Components 1.1
20import Unity.Notifications 1.0
20import Unity.Notifications 1.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Utils 0.1
22import Utils 0.1
23+import "../Components/Flickables" as Flickables
23
24
24import Ubuntu.Components.ListItems 0.1 as ListItem
25import Ubuntu.Components.ListItems 0.1 as ListItem
25
26
@@ -455,7 +456,7 @@ Item {
455 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
456 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
456 expanded: false
457 expanded: false
457 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
458 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
458− comboList: Flickable {
459+ comboList: Flickables.Flickable {
459 // this has to be wrapped inside a flickable
460 // this has to be wrapped inside a flickable
460 // to work around a feature/bug? of the
461 // to work around a feature/bug? of the
461 // ComboButton SDK-element, making a regular
462 // ComboButton SDK-element, making a regular
qml/Notifications/Notifications.qml+2−1
@@ -19,8 +19,9 @@ import Ubuntu.Components 0.1
19import Unity.Notifications 1.0 as UnityNotifications
19import Unity.Notifications 1.0 as UnityNotifications
20import Utils 0.1
20import Utils 0.1
21import "../Components"
21import "../Components"
22+import "../Components/Flickables" as Flickables
22
23
23−ListView {
24+Flickables.ListView {
24 id: notificationList
25 id: notificationList
25
26
26 objectName: "notificationList"
27 objectName: "notificationList"
qml/Panel/IndicatorRow.qml+2−1
@@ -18,6 +18,7 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Unity.Indicators 0.1 as Indicators
19import Unity.Indicators 0.1 as Indicators
20import "../Components"
20import "../Components"
21+import "../Components/Flickables" as Flickables
21
22
22Item {
23Item {
23 id: indicatorRow
24 id: indicatorRow
@@ -60,7 +61,7 @@ Item {
60 }
61 }
61 }
62 }
62
63
63− ListView {
64+ Flickables.ListView {
64 id: itemView
65 id: itemView
65 objectName: "indicatorRowItems"
66 objectName: "indicatorRowItems"
66 interactive: false
67 interactive: false
qml/Panel/Indicators/DefaultIndicatorPage.qml+2−1
@@ -21,6 +21,7 @@
21import QtQuick 2.0
21import QtQuick 2.0
22import Ubuntu.Components 0.1 as Components
22import Ubuntu.Components 0.1 as Components
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24+import "../../Components/Flickables" as Flickables
24
25
25IndicatorBase {
26IndicatorBase {
26 id: main
27 id: main
@@ -65,7 +66,7 @@ IndicatorBase {
65 }
66 }
66 }
67 }
67
68
68− ListView {
69+ Flickables.ListView {
69 id: mainMenu
70 id: mainMenu
70 objectName: "mainMenu"
71 objectName: "mainMenu"
71 model: menuStack.rootMenu
72 model: menuStack.rootMenu
qml/Panel/Indicators/client/IndicatorsList.qml+2−1
@@ -22,6 +22,7 @@ import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24import "../.."
24import "../.."
25+import "../../../Components/Flickables" as Flickables
25
26
26Page {
27Page {
27 id: page
28 id: page
@@ -35,7 +36,7 @@ Page {
35 Component.onCompleted: load(profile)
36 Component.onCompleted: load(profile)
36 }
37 }
37
38
38− ListView {
39+ Flickables.ListView {
39 id: mainMenu
40 id: mainMenu
40 objectName: "mainMenu"
41 objectName: "mainMenu"
41 anchors.fill: parent
42 anchors.fill: parent
qml/Panel/Indicators/client/IndicatorsTree.qml+2−1
@@ -22,6 +22,7 @@ import Ubuntu.Components 0.1
22import Unity.Indicators 0.1 as Indicators
22import Unity.Indicators 0.1 as Indicators
23import QMenuModel 0.1
23import QMenuModel 0.1
24import Ubuntu.Components.ListItems 0.1 as ListItem
24import Ubuntu.Components.ListItems 0.1 as ListItem
25+import "../../../Components/Flickables" as Flickables
25
26
26Page {
27Page {
27 id: page
28 id: page
@@ -52,7 +53,7 @@ Page {
52 model: unityModel
53 model: unityModel
53 }
54 }
54
55
55− Flickable {
56+ Flickables.Flickable {
56 anchors.fill: parent
57 anchors.fill: parent
57 contentHeight: all_data.height
58 contentHeight: all_data.height
58 clip:true
59 clip:true
qml/Panel/MenuContent.qml+3−2
@@ -20,6 +20,7 @@ import Ubuntu.Components 1.1
20import Unity.Indicators 0.1 as Indicators
20import Unity.Indicators 0.1 as Indicators
21import Utils 0.1
21import Utils 0.1
22import "../Components"
22import "../Components"
23+import "../Components/Flickables" as Flickables
23import "Indicators"
24import "Indicators"
24
25
25Rectangle {
26Rectangle {
@@ -39,7 +40,7 @@ Rectangle {
39 listViewHeader.currentIndex = index;
40 listViewHeader.currentIndex = index;
40 }
41 }
41
42
42− ListView {
43+ Flickables.ListView {
43 id: listViewHeader
44 id: listViewHeader
44 objectName: "indicatorsHeaderListView"
45 objectName: "indicatorsHeaderListView"
45 model: content.indicatorsModel
46 model: content.indicatorsModel
@@ -80,7 +81,7 @@ Rectangle {
80 }
81 }
81 }
82 }
82
83
83− ListView {
84+ Flickables.ListView {
84 id: listViewContent
85 id: listViewContent
85 objectName: "indicatorsContentListView"
86 objectName: "indicatorsContentListView"
86 anchors {
87 anchors {
qml/Stages/PhoneStage.qml+2−1
@@ -21,6 +21,7 @@ import Unity.Application 0.1
21import Unity.Session 0.1
21import Unity.Session 0.1
22import Utils 0.1
22import Utils 0.1
23import "../Components"
23import "../Components"
24+import "../Components/Flickables" as Flickables
24
25
25Rectangle {
26Rectangle {
26 id: root
27 id: root
@@ -120,7 +121,7 @@ Rectangle {
120
121
121 }
122 }
122
123
123− Flickable {
124+ Flickables.Flickable {
124 id: spreadView
125 id: spreadView
125 objectName: "spreadView"
126 objectName: "spreadView"
126 anchors.fill: parent
127 anchors.fill: parent
qml/Stages/TabletStage.qml+2−1
@@ -20,6 +20,7 @@ import Ubuntu.Gestures 0.1
20import Unity.Application 0.1
20import Unity.Application 0.1
21import Utils 0.1
21import Utils 0.1
22import "../Components"
22import "../Components"
23+import "../Components/Flickables" as Flickables
23
24
24Rectangle {
25Rectangle {
25 id: root
26 id: root
@@ -153,7 +154,7 @@ Rectangle {
153 }
154 }
154 }
155 }
155
156
156− Flickable {
157+ Flickables.Flickable {
157 id: spreadView
158 id: spreadView
158 anchors.fill: parent
159 anchors.fill: parent
159 interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
160 interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)