github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2025-01-09 17:56:22 +01:00
Code Releases Activity

Merge pull request #954

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MiddlePanel.qml
View File

@ -191,6 +191,7 @@ Rectangle {
from: 0 - target.width from: 0 - target.width
to: 0 to: 0
duration: 300 duration: 300
easing.type: Easing.OutCubic
} }
PropertyAnimation { PropertyAnimation {
target: exitItem target: exitItem
@ -198,6 +199,7 @@ Rectangle {
from: 0 from: 0
to: target.width to: target.width
duration: 300 duration: 300
easing.type: Easing.OutCubic
} }
} }
} }

12
components/MenuButton.qml
View File

@ -57,19 +57,19 @@ Rectangle {
color: checked ? "#FFFFFF" : "#1C1C1C" color: checked ? "#FFFFFF" : "#1C1C1C"
property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 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 { transform: Scale {
yScale: button.present ? 1 : 0 yScale: button.present ? 1 : 0
Behavior on yScale { Behavior on yScale {
NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } NumberAnimation { duration: 200; easing.type: Easing.OutCubic }
} }
} }
Behavior on height { Behavior on height {
SequentialAnimation { SequentialAnimation {
NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } NumberAnimation { duration: 200; easing.type: Easing.OutCubic }
} }
} }
@ -88,13 +88,13 @@ Rectangle {
Rectangle { Rectangle {
id: dot id: dot
anchors.centerIn: parent anchors.centerIn: parent
width: 16 * scaleRatio width: 14 * scaleRatio
height: width height: width
radius: height / 2 radius: height / 2
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
width: 12 * scaleRatio width: 10 * scaleRatio
height: width height: width
radius: height / 2 radius: height / 2
color: "#1C1C1C" color: "#1C1C1C"
@ -135,7 +135,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: parent.getOffset() + 50 * scaleRatio anchors.leftMargin: parent.getOffset() + 50 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 * scaleRatio font.pixelSize: 16 * scaleRatio
color: parent.checked ? "#000000" : "#FFFFFF" color: parent.checked ? "#000000" : "#FFFFFF"
} }