diff options
| author |  Subsurface <dirk@subsurface-divelog.org> | 2017-10-05 22:27:20 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-05 22:27:20 -0700 |
| commit | 95e5bcb081a46a869c569e0bec166934927b26cb (patch) | |
| tree | 7e19474c01e91cda1db2082de38cf8e4a74385fc | |
| parent | 30be43c3113102c768d622688ea26ae4f69e2319 (diff) | |
| parent | 49101b9f04a5654e1bae98f0972ddb9a1196eef2 (diff) | |
| download | subsurface-95e5bcb081a46a869c569e0bec166934927b26cb.tar.gz | |
Merge pull request #642 from Subsurface-divelog/editStartsOnTop
Edit starts on top
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 32 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 2 |
3 files changed, 22 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 175c4a30c..0ff823514 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,9 +262,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/settings.cpp mobile-widgets/qml/kirigami/src/enums.cpp - mobile-widgets/qml/kirigami/src/libkirigami/basictheme.cpp - mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp - mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.cpp ) diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index b1357ef55..aa344817b 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -84,19 +84,29 @@ Kirigami.Page { Transition { from: "view" to: "*" - SequentialAnimation { - NumberAnimation { - target: detailsEditFlickable - properties: "visible" - from: 0 - to: 1 - duration: 10 + ParallelAnimation { + SequentialAnimation { + NumberAnimation { + target: detailsEditFlickable + properties: "visible" + from: 0 + to: 1 + duration: 10 + } + ScaleAnimator { + target: detailsEditFlickable + from: 0.3 + to: 1 + duration: 400 + easing.type: Easing.InOutQuad + } } - ScaleAnimator { + + NumberAnimation { target: detailsEditFlickable - from: 0.3 - to: 1 - duration: 400 + property: "contentY" + to: 0 + duration: 200 easing.type: Easing.InOutQuad } } diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 04f2a2c6b..9c2167e11 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -33,7 +33,7 @@ if [ "$NOPULL" = "" ] ; then git checkout master git pull origin master # if we want to pin a specific Kirigami version, we can do this here - # git checkout v2.2.0 + git checkout 23ca2077027b214189ba72ca8dab1590a163c955 popd fi if [ ! -d breeze-icons ] ; then |