on xenial help sign in
disable the MouseArea in case we revealed the launcher by a touch drag
commitf9e9c6e6087a788dbbed2a67b1881c76e22bd92e authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 11 Feb 2015, 14:29 (12 years ago) parent17ee699
1 file changed+8−2
qml/Launcher/Launcher.qml+8−2
qml/Launcher/Launcher.qml+8−2
@@ -247,17 +247,21 @@ Item {
247247 id: hoverArea
248248 anchors { fill: panel; rightMargin: -1 }
249249 hoverEnabled: true
250+ propagateComposedEvents: true
250251 onContainsMouseChanged: {
251252 if (containsMouse) {
252253 root.switchToNextState("visibleTemporary")
253254 }
254255 }
256+ onPressed: mouse.accepted = false;
255257
256258 // We need to eat touch events here in order to make sure that
257259 // we don't trigger both, the dragArea and the hoverArea
258260 MultiPointTouchArea {
259− anchors.fill: parent
261+ anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
262+ width: units.dp(1)
260263 mouseEnabled: false
264+ enabled: parent.enabled
261265 }
262266 }
263267
@@ -315,15 +319,17 @@ Item {
315319 target: panel
316320 x: 0
317321 }
322+ PropertyChanges { target: hoverArea; enabled: false }
318323 },
319324 State {
320325 name: "visibleTemporary"
321326 extend: "visible"
322− when: howerArea.containsMouse
327+ when: hoverArea.containsMouse
323328 PropertyChanges {
324329 target: root
325330 autohideEnabled: true
326331 }
332+ PropertyChanges { target: hoverArea; enabled: true }
327333 },
328334 State {
329335 name: "teasing"