From eec1560ead8e613aa37e99658803957c06dd0c5a Mon Sep 17 00:00:00 2001 From: selsta Date: Tue, 22 Jan 2019 22:20:42 +0100 Subject: [PATCH] IconButton: fix mousearea and animation Co-authored-by: mmbyday --- components/IconButton.qml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/components/IconButton.qml b/components/IconButton.qml index 801c01e9..ba6d1e94 100644 --- a/components/IconButton.qml +++ b/components/IconButton.qml @@ -35,7 +35,6 @@ Item { signal clicked(var mouse) - id: button width: parent.height height: parent.height @@ -47,13 +46,13 @@ Item { id: buttonImage source: "" x : (parent.width - width) / 2 - y : (parent.height - height) /2 + y : (parent.height - height) / 2 z: 100 } MouseArea { id: buttonArea - anchors.fill: parent + anchors.fill: buttonImage hoverEnabled: true cursorShape: Qt.PointingHandCursor @@ -61,14 +60,21 @@ Item { buttonImage.x = buttonImage.x + 2 buttonImage.y = buttonImage.y + 2 } + onReleased: { - buttonImage.x = buttonImage.x - 2 - buttonImage.y = buttonImage.y - 2 + buttonImage.x = (parent.width - width) / 2 + buttonImage.y = (parent.height - height) / 2 + } + + onExited: { + if (pressed) { + buttonImage.x = (parent.width - width) / 2 + buttonImage.y = (parent.height - height) / 2 + } } onClicked: { parent.clicked(mouse) } } - }