git.iko.soy/unity8
on xenial help sign in
disable the MouseArea in case we revealed the launcher by a touch drag
f9e9c6eMichael Zanetti
qml/Launcher/Launcher.qml+8−2
compare with xenial
unifiedsplit
@@ -247,17 +247,21 @@ Item {
247 id: hoverArea
247 id: hoverArea
248 anchors { fill: panel; rightMargin: -1 }
248 anchors { fill: panel; rightMargin: -1 }
249 hoverEnabled: true
249 hoverEnabled: true
250+ propagateComposedEvents: true
250 onContainsMouseChanged: {
251 onContainsMouseChanged: {
251 if (containsMouse) {
252 if (containsMouse) {
252 root.switchToNextState("visibleTemporary")
253 root.switchToNextState("visibleTemporary")
253 }
254 }
254 }
255 }
256+ onPressed: mouse.accepted = false;
255
257
256 // We need to eat touch events here in order to make sure that
258 // We need to eat touch events here in order to make sure that
257 // we don't trigger both, the dragArea and the hoverArea
259 // we don't trigger both, the dragArea and the hoverArea
258 MultiPointTouchArea {
260 MultiPointTouchArea {
259− anchors.fill: parent
261+ anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
262+ width: units.dp(1)
260 mouseEnabled: false
263 mouseEnabled: false
264+ enabled: parent.enabled
261 }
265 }
262 }
266 }
263
267
@@ -315,15 +319,17 @@ Item {
315 target: panel
319 target: panel
316 x: 0
320 x: 0
317 }
321 }
322+ PropertyChanges { target: hoverArea; enabled: false }
318 },
323 },
319 State {
324 State {
320 name: "visibleTemporary"
325 name: "visibleTemporary"
321 extend: "visible"
326 extend: "visible"
322− when: howerArea.containsMouse
327+ when: hoverArea.containsMouse
323 PropertyChanges {
328 PropertyChanges {
324 target: root
329 target: root
325 autohideEnabled: true
330 autohideEnabled: true
326 }
331 }
332+ PropertyChanges { target: hoverArea; enabled: true }
327 },
333 },
328 State {
334 State {
329 name: "teasing"
335 name: "teasing"