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
51093adAndrea Cimitan
Bottombar/Bottombar.qml+1−1
compare with xenial
unifiedsplit
@@ -92,7 +92,7 @@ Item {
92
92
93 InputFilterArea {
93 InputFilterArea {
94 anchors.fill: parent
94 anchors.fill: parent
95− blockInput: dismissTimer.running
95+ blockInput: !dragArea.dragging
96 }
96 }
97 }
97 }
98
98
Bottombar/HudButton.qml+3−3
@@ -37,12 +37,13 @@ Item {
37 anchors.centerIn: parent
37 anchors.centerIn: parent
38 height: units.gu(12)
38 height: units.gu(12)
39 width: height
39 width: height
40− opacity: item.mouseOver ? 1 : 0.7
40+ opacity: item.mouseOver || abstractButton.pressed ? 1 : 0.7
41− scale: item.mouseOver ? scaleOnMouseOver : 1
41+ scale: item.mouseOver || abstractButton.pressed ? scaleOnMouseOver : 1
42 Behavior on opacity {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}
42 Behavior on opacity {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}
43 Behavior on scale {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}
43 Behavior on scale {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}
44
44
45 AbstractButton {
45 AbstractButton {
46+ id: abstractButton
46 anchors.fill: parent
47 anchors.fill: parent
47 style: Image {
48 style: Image {
48 anchors.fill: parent
49 anchors.fill: parent
@@ -50,7 +51,6 @@ Item {
50 }
51 }
51
52
52 onClicked: item.clicked()
53 onClicked: item.clicked()
53− onPressedChanged: item.mouseOver = pressed
54 }
54 }
55
55
56 Image {
56 Image {