git.iko.soy/unity8
on xenial help sign in
fix the inverse mouse area
36ed740Lukáš Tinkl
qml/Stages/WindowControlsOverlay.qml+7−3
compare with xenial
unifiedsplit
@@ -36,7 +36,6 @@ Item {
36 // NB: for testing set to 2, not to clash with unity7 touch overlay controls
36 // NB: for testing set to 2, not to clash with unity7 touch overlay controls
37 minimumTouchPoints: 3
37 minimumTouchPoints: 3
38 maximumTouchPoints: minimumTouchPoints
38 maximumTouchPoints: minimumTouchPoints
39− releaseRejectPeriod: 500
40
39
41 readonly property bool recognizedPress: status == TouchGestureArea.Recognized &&
40 readonly property bool recognizedPress: status == TouchGestureArea.Recognized &&
42 touchPoints.length >= minimumTouchPoints &&
41 touchPoints.length >= minimumTouchPoints &&
@@ -105,7 +104,7 @@ Item {
105 id: overlay
104 id: overlay
106 objectName: "windowControlsOverlay"
105 objectName: "windowControlsOverlay"
107 anchors.fill: parent
106 anchors.fill: parent
108− enabled: target && overlayTimer.running
107+ enabled: overlayTimer.running
109 visible: opacity > 0
108 visible: opacity > 0
110 opacity: enabled ? 0.95 : 0
109 opacity: enabled ? 0.95 : 0
111
110
@@ -143,8 +142,13 @@ Item {
143 visible: overlay.visible
142 visible: overlay.visible
144 enabled: visible
143 enabled: visible
145 onPressed: {
144 onPressed: {
145+ if (gestureArea.recognizedPress || gestureArea.recognizedDrag) {
146+ mouse.accepted = false;
147+ return;
148+ }
149+
146 overlayTimer.stop();
150 overlayTimer.stop();
147− mouse.accepted = false;
151+ mouse.accepted = root.contains(Qt.point(mouse.x, mouse.y));
148 }
152 }
149 propagateComposedEvents: true
153 propagateComposedEvents: true
150 }
154 }