diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2017-11-22 11:57:55 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2017-11-22 11:57:55 -0600 |
| commit | ca7113146315bb82238a3e88a83c623042cc16c9 (patch) | |
| tree | 9f4f7ac56b0d02064f0f4382e5a73690032acf27 | |
| parent | 2dfc8d6324bc9f97425804cb980bd1c64d57b7a2 (diff) | |
| parent | c349b5d248ef540d3aa1d456ab7b76884b1863b4 (diff) | |
| download | monzero-gui-ca7113146315bb82238a3e88a83c623042cc16c9.tar.gz monzero-gui-ca7113146315bb82238a3e88a83c623042cc16c9.tar.xz monzero-gui-ca7113146315bb82238a3e88a83c623042cc16c9.zip | |
Merge pull request #954
476b727 Smoother and faster animations for the menu buttons
1ada4f8 Decreasing menu button height
c349b5d Add easing to page switching animation - OutCubic
| -rw-r--r-- | MiddlePanel.qml | 2 | ||||
| -rw-r--r-- | components/MenuButton.qml | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 25fc3170..7d7fcb28 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -191,6 +191,7 @@ Rectangle { from: 0 - target.width to: 0 duration: 300 + easing.type: Easing.OutCubic } PropertyAnimation { target: exitItem @@ -198,6 +199,7 @@ Rectangle { from: 0 to: target.width duration: 300 + easing.type: Easing.OutCubic } } } diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 23ab4f74..41ff87cf 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -57,19 +57,19 @@ 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 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 } } } @@ -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" } |