1
mirror of https://github.com/monero-project/monero-gui synced 2025-01-08 18:26:23 +01:00

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
This commit is contained in:
luigi1111 2017-11-22 11:57:55 -06:00
commit ca71131463
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 8 additions and 6 deletions

View File

@ -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
}
}
}

View File

@ -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"
}