From c00804eff6af01bc005df6795420e40766429f67 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 5 Oct 2017 12:14:57 -0700 Subject: QML UI: always start edit at top of page When starting to edit / add a dive, the Flickable needs to be positioned at the top of the page, not the last position shown. For clarity I'll do the re-indentation in the next commit. Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index b1357ef55..3c17641c6 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -84,6 +84,7 @@ Kirigami.Page { Transition { from: "view" to: "*" + ParallelAnimation { SequentialAnimation { NumberAnimation { target: detailsEditFlickable @@ -100,6 +101,15 @@ Kirigami.Page { easing.type: Easing.InOutQuad } } + + NumberAnimation { + target: detailsEditFlickable + property: "contentY" + to: 0 + duration: 200 + easing.type: Easing.InOutQuad + } + } }, Transition { from: "*" -- cgit v1.2.3-70-g09d2 From deff17fa36d991b3447a5fde631b10887036e965 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 5 Oct 2017 12:15:33 -0700 Subject: Whitespace This commit is empty when shown with '-w' - it just updates the indentation after commit c00804eff6 ("QML UI: always start edit at top of page"). Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 3c17641c6..aa344817b 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -85,31 +85,31 @@ Kirigami.Page { from: "view" to: "*" ParallelAnimation { - SequentialAnimation { - NumberAnimation { - target: detailsEditFlickable - properties: "visible" - from: 0 - to: 1 - duration: 10 + 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 } } - - NumberAnimation { - target: detailsEditFlickable - property: "contentY" - to: 0 - duration: 200 - easing.type: Easing.InOutQuad - } - } }, Transition { from: "*" -- cgit v1.2.3-70-g09d2 From 49101b9f04a5654e1bae98f0972ddb9a1196eef2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 5 Oct 2017 22:25:42 -0700 Subject: QML UIL: go back to older Kirigami This brings back correct theming. Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 3 --- scripts/mobilecomponents.sh | 2 +- 2 files changed, 1 insertion(+), 4 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/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 -- cgit v1.2.3-70-g09d2