Merge lp:~unity-team/unity8/flickables-speed-workaround into lp:unity8
- flickables-speed-workaround
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Albert Astals Cid |
Approved revision: | 1243 |
Merged at revision: | 1362 |
Proposed branch: | lp:~unity-team/unity8/flickables-speed-workaround |
Merge into: | lp:unity8 |
Diff against target: |
747 lines (+157/-44) 32 files modified
qml/Components/Carousel.qml (+2/-3) qml/Components/Flickables/Flickable.qml (+23/-0) qml/Components/Flickables/GridView.qml (+25/-0) qml/Components/Flickables/ListView.qml (+25/-0) qml/Components/Flickables/ListViewWithPageHeader.qml (+23/-0) qml/Components/ResponsiveGridView.qml (+2/-1) qml/Components/ZoomableImage.qml (+2/-2) qml/Dash/CardHorizontalList.qml (+2/-1) qml/Dash/DashContent.qml (+2/-3) qml/Dash/DashNavigationButton.qml (+2/-1) qml/Dash/DashNavigationList.qml (+2/-1) qml/Dash/PageHeader.qml (+2/-1) qml/Dash/PreviewListView.qml (+2/-3) qml/Dash/Previews/Preview.qml (+2/-1) qml/Dash/Previews/PreviewImageGallery.qml (+3/-2) qml/Dash/ScopeListView.qml (+3/-6) qml/Dash/ScopeSettingsPage.qml (+2/-1) qml/Dash/ScopesOverviewAll.qml (+2/-1) qml/Dash/ScopesOverviewFavorites.qml (+4/-2) qml/Greeter/LoginList.qml (+2/-2) qml/Hud/Hud.qml (+2/-1) qml/Hud/HudParametrizedActionsPage.qml (+2/-1) qml/Launcher/LauncherPanel.qml (+2/-1) qml/Notifications/Notification.qml (+2/-1) qml/Notifications/Notifications.qml (+2/-1) qml/Panel/IndicatorRow.qml (+2/-1) qml/Panel/Indicators/DefaultIndicatorPage.qml (+2/-1) qml/Panel/Indicators/client/IndicatorsList.qml (+2/-1) qml/Panel/Indicators/client/IndicatorsTree.qml (+2/-1) qml/Panel/MenuContent.qml (+3/-2) qml/Stages/PhoneStage.qml (+2/-1) qml/Stages/TabletStage.qml (+2/-1) |
To merge this branch: | bzr merge lp:~unity-team/unity8/flickables-speed-workaround |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Albert Astals Cid (community) | Approve | ||
Review via email: mp+237944@code.launchpad.net |
This proposal supersedes a proposal from 2014-09-11.
Commit message
Fix flickable speed to be resolution independent, by subclassing components
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
* If you changed the UI, has there been a design review?
n/a
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1238
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
I'll review this after we land lp:~unity-team/unity8/scopes_more_things_on_memory
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1239
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1241
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal | # |
Text conflict in debian/control
Text conflict in plugins/
Text conflict in qml/Dash/
Text conflict in qml/Dash/
Text conflict in qml/Panel/
Text conflict in qml/Panel/
Text conflict in tests/plugins/
Text conflict in tests/plugins/
Text conflict in tests/qmltests/
9 conflicts encountered.
- 1243. By Andrea Cimitan
-
Attempt to merge
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1242
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1242
http://
Executed test runs:
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
Ok, code looks reasnoable for a workaround and on the phone it feels ok, so if this is the workaround we want, let's go with it.
* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
* Did CI run pass? If not, please explain why.
No, because it's broken in trunk
* Did you make sure that the branch does not contain spurious tags?
Yes
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1243
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'qml/Components/Carousel.qml' |
2 | --- qml/Components/Carousel.qml 2014-07-08 17:49:18 +0000 |
3 | +++ qml/Components/Carousel.qml 2014-10-10 11:46:46 +0000 |
4 | @@ -17,6 +17,7 @@ |
5 | import QtQuick 2.0 |
6 | import Ubuntu.Components 0.1 |
7 | import "carousel.js" as CarouselJS |
8 | +import "Flickables" as Flickables |
9 | |
10 | /*! The Carousel component presents the items of a model in a carousel view. It's similar to a |
11 | cover flow. But it stops at it's boundaries (therefore no PathView is used). |
12 | @@ -63,7 +64,7 @@ |
13 | and footer item to compensate that. |
14 | |
15 | The scaling of the items is controlled by the variable continuousIndex, described below. */ |
16 | - ListView { |
17 | + Flickables.ListView { |
18 | id: listView |
19 | objectName: "listView" |
20 | |
21 | @@ -135,8 +136,6 @@ |
22 | |
23 | boundsBehavior: Flickable.DragOverBounds |
24 | cacheBuffer: carousel.cacheBuffer |
25 | - flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default |
26 | - maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default |
27 | orientation: ListView.Horizontal |
28 | |
29 | function getXFromContinuousIndex(index) { |
30 | |
31 | === added directory 'qml/Components/Flickables' |
32 | === added file 'qml/Components/Flickables/Flickable.qml' |
33 | --- qml/Components/Flickables/Flickable.qml 1970-01-01 00:00:00 +0000 |
34 | +++ qml/Components/Flickables/Flickable.qml 2014-10-10 11:46:46 +0000 |
35 | @@ -0,0 +1,23 @@ |
36 | +/* |
37 | + * Copyright (C) 2014 Canonical, Ltd. |
38 | + * |
39 | + * This program is free software; you can redistribute it and/or modify |
40 | + * it under the terms of the GNU General Public License as published by |
41 | + * the Free Software Foundation; version 3. |
42 | + * |
43 | + * This program is distributed in the hope that it will be useful, |
44 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
45 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
46 | + * GNU General Public License for more details. |
47 | + * |
48 | + * You should have received a copy of the GNU General Public License |
49 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
50 | + */ |
51 | + |
52 | +import QtQuick 2.3 as QtQuick |
53 | +import Ubuntu.Components 1.1 |
54 | + |
55 | +QtQuick.Flickable { |
56 | + flickDeceleration: 1500 * units.gridUnit / 8 |
57 | + maximumFlickVelocity: 2500 * units.gridUnit / 8 |
58 | +} |
59 | |
60 | === added file 'qml/Components/Flickables/GridView.qml' |
61 | --- qml/Components/Flickables/GridView.qml 1970-01-01 00:00:00 +0000 |
62 | +++ qml/Components/Flickables/GridView.qml 2014-10-10 11:46:46 +0000 |
63 | @@ -0,0 +1,25 @@ |
64 | +/* |
65 | + * Copyright (C) 2014 Canonical, Ltd. |
66 | + * |
67 | + * This program is free software; you can redistribute it and/or modify |
68 | + * it under the terms of the GNU General Public License as published by |
69 | + * the Free Software Foundation; version 3. |
70 | + * |
71 | + * This program is distributed in the hope that it will be useful, |
72 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
73 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
74 | + * GNU General Public License for more details. |
75 | + * |
76 | + * You should have received a copy of the GNU General Public License |
77 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
78 | + */ |
79 | + |
80 | +import QtQuick 2.3 as QtQuick |
81 | +import Ubuntu.Components 1.1 |
82 | + |
83 | +QtQuick.GridView { |
84 | + // Attached components and usages like GridView.onRemove are known not to work |
85 | + // please use GridView directly from QtQuick if needed |
86 | + flickDeceleration: 1500 * units.gridUnit / 8 |
87 | + maximumFlickVelocity: 2500 * units.gridUnit / 8 |
88 | +} |
89 | |
90 | === added file 'qml/Components/Flickables/ListView.qml' |
91 | --- qml/Components/Flickables/ListView.qml 1970-01-01 00:00:00 +0000 |
92 | +++ qml/Components/Flickables/ListView.qml 2014-10-10 11:46:46 +0000 |
93 | @@ -0,0 +1,25 @@ |
94 | +/* |
95 | + * Copyright (C) 2014 Canonical, Ltd. |
96 | + * |
97 | + * This program is free software; you can redistribute it and/or modify |
98 | + * it under the terms of the GNU General Public License as published by |
99 | + * the Free Software Foundation; version 3. |
100 | + * |
101 | + * This program is distributed in the hope that it will be useful, |
102 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
103 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
104 | + * GNU General Public License for more details. |
105 | + * |
106 | + * You should have received a copy of the GNU General Public License |
107 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
108 | + */ |
109 | + |
110 | +import QtQuick 2.3 as QtQuick |
111 | +import Ubuntu.Components 1.1 |
112 | + |
113 | +QtQuick.ListView { |
114 | + // Attached components and usages like ListView.onRemove are known not to work |
115 | + // please use ListView directly from QtQuick if needed |
116 | + flickDeceleration: 1500 * units.gridUnit / 8 |
117 | + maximumFlickVelocity: 2500 * units.gridUnit / 8 |
118 | +} |
119 | |
120 | === added file 'qml/Components/Flickables/ListViewWithPageHeader.qml' |
121 | --- qml/Components/Flickables/ListViewWithPageHeader.qml 1970-01-01 00:00:00 +0000 |
122 | +++ qml/Components/Flickables/ListViewWithPageHeader.qml 2014-10-10 11:46:46 +0000 |
123 | @@ -0,0 +1,23 @@ |
124 | +/* |
125 | + * Copyright (C) 2014 Canonical, Ltd. |
126 | + * |
127 | + * This program is free software; you can redistribute it and/or modify |
128 | + * it under the terms of the GNU General Public License as published by |
129 | + * the Free Software Foundation; version 3. |
130 | + * |
131 | + * This program is distributed in the hope that it will be useful, |
132 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
133 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
134 | + * GNU General Public License for more details. |
135 | + * |
136 | + * You should have received a copy of the GNU General Public License |
137 | + * along with this program. If not, see <http://www.gnu.org/licenses/>. |
138 | + */ |
139 | + |
140 | +import Dash 0.1 |
141 | +import Ubuntu.Components 1.1 |
142 | + |
143 | +ListViewWithPageHeader { |
144 | + flickDeceleration: 1500 * units.gridUnit / 8 |
145 | + maximumFlickVelocity: 2500 * units.gridUnit / 8 |
146 | +} |
147 | |
148 | === modified file 'qml/Components/ResponsiveGridView.qml' |
149 | --- qml/Components/ResponsiveGridView.qml 2014-09-19 10:31:14 +0000 |
150 | +++ qml/Components/ResponsiveGridView.qml 2014-10-10 11:46:46 +0000 |
151 | @@ -16,6 +16,7 @@ |
152 | |
153 | import QtQuick 2.3 |
154 | import Ubuntu.Components 0.1 |
155 | +import "Flickables" as Flickables |
156 | |
157 | /* |
158 | Essentially a GridView where you can specify the maximum number of columns it can have. |
159 | @@ -55,7 +56,7 @@ |
160 | return rows * height |
161 | } |
162 | |
163 | - GridView { |
164 | + Flickables.GridView { |
165 | id: gridView |
166 | objectName: "responsiveGridViewGrid" |
167 | anchors { |
168 | |
169 | === modified file 'qml/Components/ZoomableImage.qml' |
170 | --- qml/Components/ZoomableImage.qml 2014-04-30 13:51:11 +0000 |
171 | +++ qml/Components/ZoomableImage.qml 2014-10-10 11:46:46 +0000 |
172 | @@ -16,7 +16,7 @@ |
173 | |
174 | import QtQuick 2.0 |
175 | import Ubuntu.Components 0.1 |
176 | -import "../Components" |
177 | +import "Flickables" as Flickables |
178 | |
179 | /*! \brief Zoomable for image. |
180 | |
181 | @@ -32,7 +32,7 @@ |
182 | property alias scaleTo: lazyImage.scaleTo |
183 | property alias asynchronous: lazyImage.asynchronous |
184 | |
185 | - Flickable { |
186 | + Flickables.Flickable { |
187 | id: flickable |
188 | objectName: "flickable" |
189 | clip: true |
190 | |
191 | === modified file 'qml/Dash/CardHorizontalList.qml' |
192 | --- qml/Dash/CardHorizontalList.qml 2014-09-30 09:23:23 +0000 |
193 | +++ qml/Dash/CardHorizontalList.qml 2014-10-10 11:46:46 +0000 |
194 | @@ -17,6 +17,7 @@ |
195 | import QtQuick 2.2 |
196 | import Ubuntu.Components 1.1 |
197 | import "../Components" |
198 | +import "../Components/Flickables" as Flickables |
199 | |
200 | DashRenderer { |
201 | id: root |
202 | @@ -25,7 +26,7 @@ |
203 | collapsedHeight: expandedHeight |
204 | clip: true |
205 | |
206 | - ListView { |
207 | + Flickables.ListView { |
208 | id: listView |
209 | anchors { |
210 | fill: parent |
211 | |
212 | === modified file 'qml/Dash/DashContent.qml' |
213 | --- qml/Dash/DashContent.qml 2014-09-22 14:24:34 +0000 |
214 | +++ qml/Dash/DashContent.qml 2014-10-10 11:46:46 +0000 |
215 | @@ -19,6 +19,7 @@ |
216 | import Unity 0.2 |
217 | import Utils 0.1 |
218 | import "../Components" |
219 | +import "../Components/Flickables" as Flickables |
220 | |
221 | Item { |
222 | id: dashContent |
223 | @@ -97,7 +98,7 @@ |
224 | anchors.fill: parent |
225 | } |
226 | |
227 | - ListView { |
228 | + Flickables.ListView { |
229 | id: dashContentList |
230 | objectName: "dashContentList" |
231 | |
232 | @@ -105,8 +106,6 @@ |
233 | anchors.fill: parent |
234 | orientation: ListView.Horizontal |
235 | boundsBehavior: Flickable.DragAndOvershootBounds |
236 | - flickDeceleration: units.gu(625) |
237 | - maximumFlickVelocity: width * 5 |
238 | snapMode: ListView.SnapOneItem |
239 | highlightMoveDuration: 250 |
240 | highlightRangeMode: ListView.StrictlyEnforceRange |
241 | |
242 | === modified file 'qml/Dash/DashNavigationButton.qml' |
243 | --- qml/Dash/DashNavigationButton.qml 2014-08-29 07:59:08 +0000 |
244 | +++ qml/Dash/DashNavigationButton.qml 2014-10-10 11:46:46 +0000 |
245 | @@ -16,6 +16,7 @@ |
246 | |
247 | import QtQuick 2.2 |
248 | import Ubuntu.Components 1.1 |
249 | +import "../Components/Flickables" as Flickables |
250 | |
251 | AbstractButton { |
252 | id: root |
253 | @@ -75,7 +76,7 @@ |
254 | } |
255 | |
256 | // navigationListView is outside root |
257 | - ListView { |
258 | + Flickables.ListView { |
259 | id: navigationListView |
260 | objectName: "navigationListView" |
261 | visible: height > 0 |
262 | |
263 | === modified file 'qml/Dash/DashNavigationList.qml' |
264 | --- qml/Dash/DashNavigationList.qml 2014-08-27 10:25:47 +0000 |
265 | +++ qml/Dash/DashNavigationList.qml 2014-10-10 11:46:46 +0000 |
266 | @@ -17,6 +17,7 @@ |
267 | import QtQuick 2.2 |
268 | import Ubuntu.Components 1.1 |
269 | import "../Components" |
270 | +import "../Components/Flickables" as Flickables |
271 | |
272 | Item { |
273 | id: root |
274 | @@ -45,7 +46,7 @@ |
275 | } |
276 | } |
277 | |
278 | - Flickable { |
279 | + Flickables.Flickable { |
280 | id: flickable |
281 | |
282 | anchors.fill: parent |
283 | |
284 | === modified file 'qml/Dash/PageHeader.qml' |
285 | --- qml/Dash/PageHeader.qml 2014-09-18 21:25:41 +0000 |
286 | +++ qml/Dash/PageHeader.qml 2014-10-10 11:46:46 +0000 |
287 | @@ -21,6 +21,7 @@ |
288 | import Ubuntu.Components.ListItems 1.0 |
289 | import "../Components" |
290 | import "../Components/SearchHistoryModel" |
291 | +import "../Components/Flickables" as Flickables |
292 | |
293 | Item { |
294 | id: root |
295 | @@ -127,7 +128,7 @@ |
296 | } |
297 | } |
298 | |
299 | - Flickable { |
300 | + Flickables.Flickable { |
301 | id: headerContainer |
302 | objectName: "headerContainer" |
303 | clip: contentY < height |
304 | |
305 | === modified file 'qml/Dash/PreviewListView.qml' |
306 | --- qml/Dash/PreviewListView.qml 2014-09-18 05:05:56 +0000 |
307 | +++ qml/Dash/PreviewListView.qml 2014-10-10 11:46:46 +0000 |
308 | @@ -18,6 +18,7 @@ |
309 | import Ubuntu.Components 0.1 |
310 | import Unity 0.2 |
311 | import "../Components" |
312 | +import "../Components/Flickables" as Flickables |
313 | import "Previews" as Previews |
314 | |
315 | Item { |
316 | @@ -52,7 +53,7 @@ |
317 | onBackClicked: root.backClicked() |
318 | } |
319 | |
320 | - ListView { |
321 | + Flickables.ListView { |
322 | id: previewListView |
323 | objectName: "listView" |
324 | anchors { |
325 | @@ -66,8 +67,6 @@ |
326 | snapMode: ListView.SnapOneItem |
327 | boundsBehavior: Flickable.DragAndOvershootBounds |
328 | highlightMoveDuration: 250 |
329 | - flickDeceleration: units.gu(625) |
330 | - maximumFlickVelocity: width * 5 |
331 | cacheBuffer: 0 |
332 | |
333 | property bool open: false |
334 | |
335 | === modified file 'qml/Dash/Previews/Preview.qml' |
336 | --- qml/Dash/Previews/Preview.qml 2014-08-11 18:32:23 +0000 |
337 | +++ qml/Dash/Previews/Preview.qml 2014-10-10 11:46:46 +0000 |
338 | @@ -16,6 +16,7 @@ |
339 | |
340 | import QtQuick 2.0 |
341 | import Ubuntu.Components 0.1 |
342 | +import "../../Components/Flickables" as Flickables |
343 | |
344 | /*! \brief This component constructs the Preview UI. |
345 | * |
346 | @@ -63,7 +64,7 @@ |
347 | Repeater { |
348 | model: previewModel |
349 | |
350 | - delegate: ListView { |
351 | + delegate: Flickables.ListView { |
352 | id: column |
353 | anchors { top: parent.top; bottom: parent.bottom } |
354 | width: row.columnWidth |
355 | |
356 | === modified file 'qml/Dash/Previews/PreviewImageGallery.qml' |
357 | --- qml/Dash/Previews/PreviewImageGallery.qml 2014-09-30 08:12:23 +0000 |
358 | +++ qml/Dash/Previews/PreviewImageGallery.qml 2014-10-10 11:46:46 +0000 |
359 | @@ -17,6 +17,7 @@ |
360 | import QtQuick 2.0 |
361 | import Ubuntu.Components 1.1 |
362 | import "../../Components" |
363 | +import "../../Components/Flickables" as Flickables |
364 | |
365 | /*! This preview widget shows a horizontal list of images. |
366 | * The URIs for the images should be an array in widgetData["sources"]. |
367 | @@ -28,7 +29,7 @@ |
368 | |
369 | property Item rootItem: QuickUtils.rootItem(root) |
370 | |
371 | - ListView { |
372 | + Flickables.ListView { |
373 | id: previewImageListView |
374 | objectName: "previewImageListView" |
375 | spacing: units.gu(1) |
376 | @@ -102,7 +103,7 @@ |
377 | UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration } |
378 | } |
379 | |
380 | - ListView { |
381 | + Flickables.ListView { |
382 | id: slideShowListView |
383 | objectName: "slideShowListView" |
384 | anchors.fill: parent |
385 | |
386 | === modified file 'qml/Dash/ScopeListView.qml' |
387 | --- qml/Dash/ScopeListView.qml 2014-08-26 09:44:35 +0000 |
388 | +++ qml/Dash/ScopeListView.qml 2014-10-10 11:46:46 +0000 |
389 | @@ -1,5 +1,5 @@ |
390 | /* |
391 | - * Copyright (C) 2013 Canonical, Ltd. |
392 | + * Copyright (C) 2014 Canonical, Ltd. |
393 | * |
394 | * This program is free software; you can redistribute it and/or modify |
395 | * it under the terms of the GNU General Public License as published by |
396 | @@ -14,11 +14,8 @@ |
397 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
398 | */ |
399 | |
400 | -import QtQuick 2.0 |
401 | -import Dash 0.1 |
402 | +import "../Components/Flickables" as Flickables |
403 | |
404 | -ListViewWithPageHeader { |
405 | - maximumFlickVelocity: height * 10 |
406 | - flickDeceleration: height * 2 |
407 | +Flickables.ListViewWithPageHeader { |
408 | cacheBuffer: Number.MAX_VALUE |
409 | } |
410 | |
411 | === modified file 'qml/Dash/ScopeSettingsPage.qml' |
412 | --- qml/Dash/ScopeSettingsPage.qml 2014-09-30 15:02:23 +0000 |
413 | +++ qml/Dash/ScopeSettingsPage.qml 2014-10-10 11:46:46 +0000 |
414 | @@ -18,6 +18,7 @@ |
415 | import Ubuntu.Components 1.1 |
416 | import Unity 0.2 |
417 | import "../Components" |
418 | +import "../Components/Flickables" as Flickables |
419 | import "ScopeSettings" |
420 | |
421 | Item { |
422 | @@ -39,7 +40,7 @@ |
423 | onBackClicked: root.backClicked() |
424 | } |
425 | |
426 | - ListView { |
427 | + Flickables.ListView { |
428 | id: scopeSettings |
429 | objectName: "scopeSettings" |
430 | anchors { |
431 | |
432 | === modified file 'qml/Dash/ScopesOverviewAll.qml' |
433 | --- qml/Dash/ScopesOverviewAll.qml 2014-09-19 10:36:07 +0000 |
434 | +++ qml/Dash/ScopesOverviewAll.qml 2014-10-10 11:46:46 +0000 |
435 | @@ -16,8 +16,9 @@ |
436 | |
437 | import QtQuick 2.0 |
438 | import Ubuntu.Components 0.1 |
439 | +import "../Components/Flickables" as Flickables |
440 | |
441 | -Flickable { |
442 | +Flickables.Flickable { |
443 | id: root |
444 | |
445 | property alias model: cardGrid.model |
446 | |
447 | === modified file 'qml/Dash/ScopesOverviewFavorites.qml' |
448 | --- qml/Dash/ScopesOverviewFavorites.qml 2014-09-04 16:54:15 +0000 |
449 | +++ qml/Dash/ScopesOverviewFavorites.qml 2014-10-10 11:46:46 +0000 |
450 | @@ -14,9 +14,11 @@ |
451 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
452 | */ |
453 | |
454 | -import QtQuick 2.0 |
455 | +import QtQuick 2.3 |
456 | +import Ubuntu.Components 1.1 |
457 | +import "../Components/Flickables" as Flickables |
458 | |
459 | -Flickable { |
460 | +Flickables.Flickable { |
461 | id: root |
462 | |
463 | signal clicked(int index, var result, var itemModel) |
464 | |
465 | === modified file 'qml/Greeter/LoginList.qml' |
466 | --- qml/Greeter/LoginList.qml 2014-10-08 19:17:28 +0000 |
467 | +++ qml/Greeter/LoginList.qml 2014-10-10 11:46:46 +0000 |
468 | @@ -18,6 +18,7 @@ |
469 | import Ubuntu.Components 0.1 |
470 | import LightDM 0.1 as LightDM |
471 | import "../Components" |
472 | +import "../Components/Flickables" as Flickables |
473 | |
474 | Item { |
475 | id: root |
476 | @@ -68,7 +69,7 @@ |
477 | antialiasing: true |
478 | } |
479 | |
480 | - ListView { |
481 | + Flickables.ListView { |
482 | id: userList |
483 | objectName: "userList" |
484 | |
485 | @@ -78,7 +79,6 @@ |
486 | preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2 |
487 | highlightRangeMode: ListView.StrictlyEnforceRange |
488 | highlightMoveDuration: root.moveDuration |
489 | - flickDeceleration: 10000 |
490 | |
491 | readonly property bool movingInternally: moveTimer.running || userList.moving |
492 | |
493 | |
494 | === modified file 'qml/Hud/Hud.qml' |
495 | --- qml/Hud/Hud.qml 2014-06-11 15:36:51 +0000 |
496 | +++ qml/Hud/Hud.qml 2014-10-10 11:46:46 +0000 |
497 | @@ -19,6 +19,7 @@ |
498 | import HudClient 0.1 |
499 | |
500 | import "../Components" |
501 | +import "../Components/Flickables" as Flickables |
502 | |
503 | Item { |
504 | id: hud |
505 | @@ -400,7 +401,7 @@ |
506 | } |
507 | progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1) |
508 | |
509 | - Flickable { |
510 | + Flickables.Flickable { |
511 | anchors.left: parent.left |
512 | anchors.right: parent.right |
513 | contentHeight: resultList.height |
514 | |
515 | === modified file 'qml/Hud/HudParametrizedActionsPage.qml' |
516 | --- qml/Hud/HudParametrizedActionsPage.qml 2014-08-13 11:56:16 +0000 |
517 | +++ qml/Hud/HudParametrizedActionsPage.qml 2014-10-10 11:46:46 +0000 |
518 | @@ -18,6 +18,7 @@ |
519 | import Ubuntu.Components 1.1 |
520 | import Ubuntu.Components.Themes.Ambiance 1.1 |
521 | import "../Components" |
522 | +import "../Components/Flickables" as Flickables |
523 | |
524 | Item { |
525 | property alias header: header.title |
526 | @@ -74,7 +75,7 @@ |
527 | return values |
528 | } |
529 | |
530 | - Flickable { |
531 | + Flickables.Flickable { |
532 | anchors.top: parent.top |
533 | anchors.bottom: buttons.top |
534 | anchors.left: parent.left |
535 | |
536 | === modified file 'qml/Launcher/LauncherPanel.qml' |
537 | --- qml/Launcher/LauncherPanel.qml 2014-10-07 08:25:59 +0000 |
538 | +++ qml/Launcher/LauncherPanel.qml 2014-10-10 11:46:46 +0000 |
539 | @@ -21,6 +21,7 @@ |
540 | import Ubuntu.Components.Popups 0.1 |
541 | import "../Components/ListItems" |
542 | import "../Components/" |
543 | +import "../Components/Flickables" as Flickables |
544 | |
545 | Rectangle { |
546 | id: root |
547 | @@ -74,7 +75,7 @@ |
548 | anchors.fill: parent |
549 | clip: true |
550 | |
551 | - ListView { |
552 | + Flickables.ListView { |
553 | id: launcherListView |
554 | objectName: "launcherListView" |
555 | anchors { |
556 | |
557 | === modified file 'qml/Notifications/Notification.qml' |
558 | --- qml/Notifications/Notification.qml 2014-09-18 21:25:00 +0000 |
559 | +++ qml/Notifications/Notification.qml 2014-10-10 11:46:46 +0000 |
560 | @@ -20,6 +20,7 @@ |
561 | import Unity.Notifications 1.0 |
562 | import QMenuModel 0.1 |
563 | import Utils 0.1 |
564 | +import "../Components/Flickables" as Flickables |
565 | |
566 | import Ubuntu.Components.ListItems 0.1 as ListItem |
567 | |
568 | @@ -455,7 +456,7 @@ |
569 | onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId) |
570 | expanded: false |
571 | expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5) |
572 | - comboList: Flickable { |
573 | + comboList: Flickables.Flickable { |
574 | // this has to be wrapped inside a flickable |
575 | // to work around a feature/bug? of the |
576 | // ComboButton SDK-element, making a regular |
577 | |
578 | === modified file 'qml/Notifications/Notifications.qml' |
579 | --- qml/Notifications/Notifications.qml 2014-08-25 11:31:05 +0000 |
580 | +++ qml/Notifications/Notifications.qml 2014-10-10 11:46:46 +0000 |
581 | @@ -19,8 +19,9 @@ |
582 | import Unity.Notifications 1.0 as UnityNotifications |
583 | import Utils 0.1 |
584 | import "../Components" |
585 | +import "../Components/Flickables" as Flickables |
586 | |
587 | -ListView { |
588 | +Flickables.ListView { |
589 | id: notificationList |
590 | |
591 | objectName: "notificationList" |
592 | |
593 | === modified file 'qml/Panel/IndicatorRow.qml' |
594 | --- qml/Panel/IndicatorRow.qml 2014-05-07 13:59:58 +0000 |
595 | +++ qml/Panel/IndicatorRow.qml 2014-10-10 11:46:46 +0000 |
596 | @@ -18,6 +18,7 @@ |
597 | import Ubuntu.Components 0.1 |
598 | import Unity.Indicators 0.1 as Indicators |
599 | import "../Components" |
600 | +import "../Components/Flickables" as Flickables |
601 | |
602 | Item { |
603 | id: indicatorRow |
604 | @@ -60,7 +61,7 @@ |
605 | } |
606 | } |
607 | |
608 | - ListView { |
609 | + Flickables.ListView { |
610 | id: itemView |
611 | objectName: "indicatorRowItems" |
612 | interactive: false |
613 | |
614 | === modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml' |
615 | --- qml/Panel/Indicators/DefaultIndicatorPage.qml 2014-09-29 10:24:58 +0000 |
616 | +++ qml/Panel/Indicators/DefaultIndicatorPage.qml 2014-10-10 11:46:46 +0000 |
617 | @@ -21,6 +21,7 @@ |
618 | import QtQuick 2.0 |
619 | import Ubuntu.Components 0.1 as Components |
620 | import Unity.Indicators 0.1 as Indicators |
621 | +import "../../Components/Flickables" as Flickables |
622 | |
623 | IndicatorBase { |
624 | id: main |
625 | @@ -65,7 +66,7 @@ |
626 | } |
627 | } |
628 | |
629 | - ListView { |
630 | + Flickables.ListView { |
631 | id: mainMenu |
632 | objectName: "mainMenu" |
633 | model: menuStack.rootMenu |
634 | |
635 | === modified file 'qml/Panel/Indicators/client/IndicatorsList.qml' |
636 | --- qml/Panel/Indicators/client/IndicatorsList.qml 2014-01-30 14:54:01 +0000 |
637 | +++ qml/Panel/Indicators/client/IndicatorsList.qml 2014-10-10 11:46:46 +0000 |
638 | @@ -22,6 +22,7 @@ |
639 | import Ubuntu.Components.ListItems 0.1 as ListItem |
640 | import Unity.Indicators 0.1 as Indicators |
641 | import "../.." |
642 | +import "../../../Components/Flickables" as Flickables |
643 | |
644 | Page { |
645 | id: page |
646 | @@ -35,7 +36,7 @@ |
647 | Component.onCompleted: load(profile) |
648 | } |
649 | |
650 | - ListView { |
651 | + Flickables.ListView { |
652 | id: mainMenu |
653 | objectName: "mainMenu" |
654 | anchors.fill: parent |
655 | |
656 | === modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml' |
657 | --- qml/Panel/Indicators/client/IndicatorsTree.qml 2013-11-24 02:23:56 +0000 |
658 | +++ qml/Panel/Indicators/client/IndicatorsTree.qml 2014-10-10 11:46:46 +0000 |
659 | @@ -22,6 +22,7 @@ |
660 | import Unity.Indicators 0.1 as Indicators |
661 | import QMenuModel 0.1 |
662 | import Ubuntu.Components.ListItems 0.1 as ListItem |
663 | +import "../../../Components/Flickables" as Flickables |
664 | |
665 | Page { |
666 | id: page |
667 | @@ -52,7 +53,7 @@ |
668 | model: unityModel |
669 | } |
670 | |
671 | - Flickable { |
672 | + Flickables.Flickable { |
673 | anchors.fill: parent |
674 | contentHeight: all_data.height |
675 | clip:true |
676 | |
677 | === modified file 'qml/Panel/MenuContent.qml' |
678 | --- qml/Panel/MenuContent.qml 2014-09-29 10:24:58 +0000 |
679 | +++ qml/Panel/MenuContent.qml 2014-10-10 11:46:46 +0000 |
680 | @@ -20,6 +20,7 @@ |
681 | import Unity.Indicators 0.1 as Indicators |
682 | import Utils 0.1 |
683 | import "../Components" |
684 | +import "../Components/Flickables" as Flickables |
685 | import "Indicators" |
686 | |
687 | Rectangle { |
688 | @@ -39,7 +40,7 @@ |
689 | listViewHeader.currentIndex = index; |
690 | } |
691 | |
692 | - ListView { |
693 | + Flickables.ListView { |
694 | id: listViewHeader |
695 | objectName: "indicatorsHeaderListView" |
696 | model: content.indicatorsModel |
697 | @@ -80,7 +81,7 @@ |
698 | } |
699 | } |
700 | |
701 | - ListView { |
702 | + Flickables.ListView { |
703 | id: listViewContent |
704 | objectName: "indicatorsContentListView" |
705 | anchors { |
706 | |
707 | === modified file 'qml/Stages/PhoneStage.qml' |
708 | --- qml/Stages/PhoneStage.qml 2014-10-07 18:18:44 +0000 |
709 | +++ qml/Stages/PhoneStage.qml 2014-10-10 11:46:46 +0000 |
710 | @@ -21,6 +21,7 @@ |
711 | import Unity.Session 0.1 |
712 | import Utils 0.1 |
713 | import "../Components" |
714 | +import "../Components/Flickables" as Flickables |
715 | |
716 | Rectangle { |
717 | id: root |
718 | @@ -120,7 +121,7 @@ |
719 | |
720 | } |
721 | |
722 | - Flickable { |
723 | + Flickables.Flickable { |
724 | id: spreadView |
725 | objectName: "spreadView" |
726 | anchors.fill: parent |
727 | |
728 | === modified file 'qml/Stages/TabletStage.qml' |
729 | --- qml/Stages/TabletStage.qml 2014-10-07 18:39:38 +0000 |
730 | +++ qml/Stages/TabletStage.qml 2014-10-10 11:46:46 +0000 |
731 | @@ -20,6 +20,7 @@ |
732 | import Unity.Application 0.1 |
733 | import Utils 0.1 |
734 | import "../Components" |
735 | +import "../Components/Flickables" as Flickables |
736 | |
737 | Rectangle { |
738 | id: root |
739 | @@ -153,7 +154,7 @@ |
740 | } |
741 | } |
742 | |
743 | - Flickable { |
744 | + Flickables.Flickable { |
745 | id: spreadView |
746 | anchors.fill: parent |
747 | interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) |
FAILED: Continuous integration, rev:1237 /code.launchpad .net/~unity- team/unity8/ flickables- speed-workaroun d/+merge/ 234298/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ unity8- ci/4276/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/4722/ console jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 1277 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 1370 jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 1370 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4493/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5974 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5974/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 13063
Executed test runs:
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/4276/ rebuild
http://