on xenial help sign in
add a tiny bit of scaling in the center
commita67d07bc3df20c507fea5b3ecbfa625a1a84c3f1 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 19 May 2015, 13:46 (11 years ago) parent1d0f32a3e6d1fc
2 files changed+12−9
qml/Stages/SpreadMaths.qml+10−7 src/CMakeLists.txt+2−2
qml/Stages/SpreadMaths.qml+10−7
@@ -48,12 +48,14 @@ Item {
4848 readonly property real limitedLeftProgress: Math.min(2, leftFoldingAreaProgress)
4949 readonly property real limitedRightProgress: Math.min(2, rightFoldingAreaProgress)
5050
51−// Label {
52−// anchors { left: parent.left; top: parent.top; topMargin: - 100 }
53−// text: leftFoldingAreaProgress.toFixed(2)
54−// color: "green"
55−// fontSize: "x-large"
56−// }
51+ readonly property real middleSectionProgress: (linearX - margins - foldingAreaWidth) / (flickableWidth - (margins + foldingAreaWidth) * 2)
52+
53+ Label {
54+ anchors { left: parent.left; top: parent.top; topMargin: - 100 }
55+ text: middleSectionProgress.toFixed(2)
56+ color: "green"
57+ fontSize: "x-large"
58+ }
5759
5860 // Output
5961 readonly property int animatedX: {
@@ -113,7 +115,8 @@ Item {
113115 linearAnimation(0, 1, 1, 1 + stackScale, leftEasing.value)
114116 : limitedRightProgress > 0 ?
115117 linearAnimation(0, 1, 1, 1 + stackScale, rightEasing.value)
116− : 1
118+ // 0.5 :
119+ : 0.95 + Math.abs(middleSectionProgress - 0.5) * 0.1
117120
118121 readonly property real tileInfoOpacity: leftFoldingAreaProgress > 0 ?
119122 linearAnimation(1, 2, 1, 0, leftFoldingAreaProgress)
src/CMakeLists.txt+2−2
@@ -1,9 +1,9 @@
1−pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
1+pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt)
22
33include_directories(
44 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
55 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
6− ${CONNECTIVITY_INCLUDE_DIRS}
6+ /usr/include/connectivity-qt/
77)
88
99file(GLOB_RECURSE QML_FILES