Merge pull request #642 from Subsurface-divelog/editStartsOnTop

Edit starts on top
This commit is contained in:
Subsurface 2017-10-05 22:27:20 -07:00 committed by GitHub
commit 95e5bcb081
3 changed files with 22 additions and 15 deletions

View file

@ -262,9 +262,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp
mobile-widgets/qml/kirigami/src/settings.cpp mobile-widgets/qml/kirigami/src/settings.cpp
mobile-widgets/qml/kirigami/src/enums.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-main.cpp
subsurface-mobile-helper.cpp subsurface-mobile-helper.cpp
) )

View file

@ -84,6 +84,7 @@ Kirigami.Page {
Transition { Transition {
from: "view" from: "view"
to: "*" to: "*"
ParallelAnimation {
SequentialAnimation { SequentialAnimation {
NumberAnimation { NumberAnimation {
target: detailsEditFlickable target: detailsEditFlickable
@ -100,6 +101,15 @@ Kirigami.Page {
easing.type: Easing.InOutQuad easing.type: Easing.InOutQuad
} }
} }
NumberAnimation {
target: detailsEditFlickable
property: "contentY"
to: 0
duration: 200
easing.type: Easing.InOutQuad
}
}
}, },
Transition { Transition {
from: "*" from: "*"

View file

@ -33,7 +33,7 @@ if [ "$NOPULL" = "" ] ; then
git checkout master git checkout master
git pull origin master git pull origin master
# if we want to pin a specific Kirigami version, we can do this here # if we want to pin a specific Kirigami version, we can do this here
# git checkout v2.2.0 git checkout 23ca2077027b214189ba72ca8dab1590a163c955
popd popd
fi fi
if [ ! -d breeze-icons ] ; then if [ ! -d breeze-icons ] ; then