monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #516

Browse source 
8dc95a1 remove animation when swithing to basic layout (Jaquee)
d9a2b1a fix broken basic button (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-03-03 16:26:02 +02:00
commit 62f016387f
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/TitleBar.qml
View file

@ -41,6 +41,7 @@ Rectangle {
y: -height
property string title
property alias maximizeButtonVisible: maximizeButton.visible
z: 1
Text {
anchors.centerIn: parent
@ -52,28 +53,26 @@ Rectangle {
visible: customDecorations
}
Behavior on y {
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
}
Rectangle {
id: goToBasicVersionButton
property bool containsMouse: titleBar.mouseX >= x && titleBar.mouseX <= x + width
property bool checked: false
anchors.top: parent.top
anchors.left: parent.left
color: containsMouse || checked ? "#FFE00A" : "#000000"
color: basicMouseArea.containsMouse || checked ? "#FFE00A" : "#000000"
height: 30
width: height
Image {
anchors.centerIn: parent
rotation: parent.checked ? 180 : 0
source: parent.containsMouse || parent.checked ? "../images/goToBasicVersionHovered.png" :
source: parent.customDecorations || parent.checked ? "../images/goToBasicVersionHovered.png" :
"../images/gotoBasicVersion.png"
}
MouseArea {
id: basicMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
parent.checked = !parent.checked

36
main.qml
View file

@ -1046,19 +1046,15 @@ ApplicationWindow {
properties: "visible"
value: false
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: 30
easing.type: Easing.InCubic
duration: 200
value: 30
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "width"
to: 470
easing.type: Easing.InCubic
duration: 200
value: 470
}
PropertyAction {
targets: [leftPanel, rightPanel]
@ -1071,12 +1067,10 @@ ApplicationWindow {
value: true
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: middlePanel.height
easing.type: Easing.InCubic
duration: 200
value: middlePanel.height
}
onStopped: {
@ -1088,12 +1082,10 @@ ApplicationWindow {
SequentialAnimation {
id: goToProAnimation
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: 30
easing.type: Easing.InCubic
duration: 200
value: 30
}
PropertyAction {
target: middlePanel
@ -1105,19 +1097,15 @@ ApplicationWindow {
properties: "visible"
value: true
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "width"
to: rightPanelExpanded ? 1269 : 1269 - 300
easing.type: Easing.InCubic
duration: 200
value: rightPanelExpanded ? 1269 : 1269 - 300
}
NumberAnimation {
PropertyAction {
target: appWindow
properties: "height"
to: maxWindowHeight
easing.type: Easing.InCubic
duration: 200
value: maxWindowHeight
}
PropertyAction {
target: frameArea