From 476b727db1119be3376b1377a5d4c16f61831229 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Sun, 12 Nov 2017 22:12:56 +0100 Subject: [PATCH 1/3] Smoother and faster animations for the menu buttons --- components/MenuButton.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 23ab4f74..eb97d6db 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -63,13 +63,13 @@ Rectangle { yScale: button.present ? 1 : 0 Behavior on yScale { - NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } + NumberAnimation { duration: 200; easing.type: Easing.OutCubic } } } Behavior on height { SequentialAnimation { - NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } + NumberAnimation { duration: 200; easing.type: Easing.OutCubic } } } From 1ada4f8826d72d2d0867585c0c3c7ce285c4db18 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Sun, 12 Nov 2017 22:18:20 +0100 Subject: [PATCH 2/3] Decreasing menu button height --- components/MenuButton.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/MenuButton.qml b/components/MenuButton.qml index eb97d6db..41ff87cf 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -57,7 +57,7 @@ Rectangle { color: checked ? "#FFFFFF" : "#1C1C1C" property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 - height: present ? ((appWindow.height >= 800) ? 64 * scaleRatio : 52 * scaleRatio ) : 0 + height: present ? ((appWindow.height >= 800) ? 48 * scaleRatio : 36 * scaleRatio ) : 0 transform: Scale { yScale: button.present ? 1 : 0 @@ -88,13 +88,13 @@ Rectangle { Rectangle { id: dot anchors.centerIn: parent - width: 16 * scaleRatio + width: 14 * scaleRatio height: width radius: height / 2 Rectangle { anchors.centerIn: parent - width: 12 * scaleRatio + width: 10 * scaleRatio height: width radius: height / 2 color: "#1C1C1C" @@ -135,7 +135,7 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: parent.getOffset() + 50 * scaleRatio font.family: "Arial" - font.pixelSize: 18 * scaleRatio + font.pixelSize: 16 * scaleRatio color: parent.checked ? "#000000" : "#FFFFFF" } From c349b5d248ef540d3aa1d456ab7b76884b1863b4 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Sun, 12 Nov 2017 22:26:48 +0100 Subject: [PATCH 3/3] Add easing to page switching animation - OutCubic --- MiddlePanel.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MiddlePanel.qml b/MiddlePanel.qml index a008a62a..ac673880 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -190,6 +190,7 @@ Rectangle { from: 0 - target.width to: 0 duration: 300 + easing.type: Easing.OutCubic } PropertyAnimation { target: exitItem @@ -197,6 +198,7 @@ Rectangle { from: 0 to: target.width duration: 300 + easing.type: Easing.OutCubic } } }