git.iko.soy/unity8
on xenial help sign in
Enable the InputFilterArea only when the dragarea is not being dragged (easier logically than the timer), don't break the binding with mouseOver
commit51093ade1fd0f82ec8aebe8b65df1ce35927d6fd authorAndrea Cimitan <andrea.cimitan@canonical.com> dateFri 23 Aug 2013, 16:51 (13 years ago) parentcc14230
2 files changed+4−4
compare with xenial
unifiedsplit
Bottombar/Bottombar.qml+1−1 Bottombar/HudButton.qml+3−3
Bottombar/Bottombar.qml+1−1
@@ -92,7 +92,7 @@ Item {
9292
9393 InputFilterArea {
9494 anchors.fill: parent
95− blockInput: dismissTimer.running
95+ blockInput: !dragArea.dragging
9696 }
9797 }
9898
Bottombar/HudButton.qml+3−3
@@ -37,12 +37,13 @@ Item {
3737 anchors.centerIn: parent
3838 height: units.gu(12)
3939 width: height
40− opacity: item.mouseOver ? 1 : 0.7
41− scale: item.mouseOver ? scaleOnMouseOver : 1
40+ opacity: item.mouseOver || abstractButton.pressed ? 1 : 0.7
41+ scale: item.mouseOver || abstractButton.pressed ? scaleOnMouseOver : 1
4242 Behavior on opacity {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}
4343 Behavior on scale {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}
4444
4545 AbstractButton {
46+ id: abstractButton
4647 anchors.fill: parent
4748 style: Image {
4849 anchors.fill: parent
@@ -50,7 +51,6 @@ Item {
5051 }
5152
5253 onClicked: item.clicked()
53− onPressedChanged: item.mouseOver = pressed
5454 }
5555
5656 Image {