diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-03 16:26:02 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-03 16:26:02 +0200 |
| commit | 62f016387fdeb508c6ec2a77fa33c59f2fff52db (patch) | |
| tree | c5ab41b698b3ae0f8cfd9fb26c1e515ad61b2f13 /components | |
| parent | 9859f33914120259818ea63973efabc7ccd1473e (diff) | |
| parent | 8dc95a17e6a054793e8b91e73606e56e95120611 (diff) | |
| download | monzero-gui-62f016387fdeb508c6ec2a77fa33c59f2fff52db.tar.gz monzero-gui-62f016387fdeb508c6ec2a77fa33c59f2fff52db.tar.xz monzero-gui-62f016387fdeb508c6ec2a77fa33c59f2fff52db.zip | |
Merge pull request #516
8dc95a1 remove animation when swithing to basic layout (Jaquee)
d9a2b1a fix broken basic button (Jaquee)
Diffstat (limited to 'components')
| -rw-r--r-- | components/TitleBar.qml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/components/TitleBar.qml b/components/TitleBar.qml index aa793985..bcbc0e64 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -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 |