Use JS library as function
commit2325677b7f1f36304b32a93822b2be8a77baa418
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateWed 27 Jul 2016, 18:43 (10 years ago)
parent41a28fe
qml/Components/Flickable.qml+2−2
@@ -19,6 +19,6 @@ import Ubuntu.Components 1.3
1919import "flickableUtils.js" as FlickableUtilsJS
2020
2121QtQuick.Flickable {
22− flickDeceleration: FlickableUtilsJS.flickDeceleration
23− maximumFlickVelocity: FlickableUtilsJS.maximumFlickVelocity
22+ flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
23+ maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
2424}
qml/Components/GridView.qml+2−2
@@ -19,6 +19,6 @@ import Ubuntu.Components 1.3
1919import "flickableUtils.js" as FlickableUtilsJS
2020
2121QtQuick.GridView {
22− flickDeceleration: FlickableUtilsJS.flickDeceleration
23− maximumFlickVelocity: FlickableUtilsJS.maximumFlickVelocity
22+ flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
23+ maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
2424}
qml/Components/ListView.qml+2−2
@@ -19,6 +19,6 @@ import Ubuntu.Components 1.3
1919import "flickableUtils.js" as FlickableUtilsJS
2020
2121QtQuick.ListView {
22− flickDeceleration: FlickableUtilsJS.flickDeceleration
23− maximumFlickVelocity: FlickableUtilsJS.maximumFlickVelocity
22+ flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
23+ maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
2424}
qml/Components/flickableUtils.js+7−2
@@ -16,5 +16,10 @@
1616
1717.pragma library
1818
19−var flickDeceleration = 1500 * units.gridUnit / 8;
20−var maximumFlickVelocity = 2500 * units.gridUnit / 8
19+function getFlickDeceleration(gridUnit) {
20+ return 1500 * gridUnit / 8;
21+}
22+
23+function getMaximumFlickVelocity(gridUnit) {
24+ return 2500 * gridUnit / 8;
25+}
qml/Dash/ScopeListView.qml+2−2
@@ -20,8 +20,8 @@ import Dash 0.1
2020import "../Components/flickableUtils.js" as FlickableUtilsJS
2121
2222ListViewWithPageHeader {
23− flickDeceleration: FlickableUtilsJS.flickDeceleration
24− maximumFlickVelocity: FlickableUtilsJS.maximumFlickVelocity
23+ flickDeceleration: FlickableUtilsJS.getFlickDeceleration(units.gridUnit)
24+ maximumFlickVelocity: FlickableUtilsJS.getMaximumFlickVelocity(units.gridUnit)
2525 // 1073741823 is s^30 -1. A quite big number so that you have "infinite" cache, but not so
2626 // big so that if you add if with itself you're outside the 2^31 int range
2727 cacheBuffer: 1073741823