git.iko.soy/unity8
on xenial help sign in
add a tiny bit of scaling in the center
a67d07bMichael Zanetti
qml/Stages/SpreadMaths.qml+10−7
compare with xenial
unifiedsplit
@@ -48,12 +48,14 @@ Item {
48 readonly property real limitedLeftProgress: Math.min(2, leftFoldingAreaProgress)
48 readonly property real limitedLeftProgress: Math.min(2, leftFoldingAreaProgress)
49 readonly property real limitedRightProgress: Math.min(2, rightFoldingAreaProgress)
49 readonly property real limitedRightProgress: Math.min(2, rightFoldingAreaProgress)
50
50
51+ readonly property real middleSectionProgress: (linearX - margins - foldingAreaWidth) / (flickableWidth - (margins + foldingAreaWidth) * 2)
52+
51−// Label {
53+ Label {
52−// anchors { left: parent.left; top: parent.top; topMargin: - 100 }
54+ anchors { left: parent.left; top: parent.top; topMargin: - 100 }
53−// text: leftFoldingAreaProgress.toFixed(2)
55+ text: middleSectionProgress.toFixed(2)
54−// color: "green"
56+ color: "green"
55−// fontSize: "x-large"
57+ fontSize: "x-large"
56−// }
58+ }
57
59
58 // Output
60 // Output
59 readonly property int animatedX: {
61 readonly property int animatedX: {
@@ -113,7 +115,8 @@ Item {
113 linearAnimation(0, 1, 1, 1 + stackScale, leftEasing.value)
115 linearAnimation(0, 1, 1, 1 + stackScale, leftEasing.value)
114 : limitedRightProgress > 0 ?
116 : limitedRightProgress > 0 ?
115 linearAnimation(0, 1, 1, 1 + stackScale, rightEasing.value)
117 linearAnimation(0, 1, 1, 1 + stackScale, rightEasing.value)
116− : 1
118+ // 0.5 :
119+ : 0.95 + Math.abs(middleSectionProgress - 0.5) * 0.1
117
120
118 readonly property real tileInfoOpacity: leftFoldingAreaProgress > 0 ?
121 readonly property real tileInfoOpacity: leftFoldingAreaProgress > 0 ?
119 linearAnimation(1, 2, 1, 0, leftFoldingAreaProgress)
122 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)
2
2
3include_directories(
3include_directories(
4 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
4 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
5 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
5 ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
6− ${CONNECTIVITY_INCLUDE_DIRS}
6+ /usr/include/connectivity-qt/
7)
7)
8
8
9file(GLOB_RECURSE QML_FILES
9file(GLOB_RECURSE QML_FILES