git.iko.soy/unity8
on xenial help sign in
Revert "Never propagate composed events"
f00cf3dDalton Durst
qml/Launcher/Drawer.qml+9−2
compare with xenial
unifiedsplit
@@ -190,10 +190,9 @@ FocusScope {
190 }
190 }
191
191
192 MouseArea {
192 MouseArea {
193− id: horizontalDragDetector
194 parent: listLoader.item ? listLoader.item : null
193 parent: listLoader.item ? listLoader.item : null
195 anchors.fill: parent
194 anchors.fill: parent
196− propagateComposedEvents: false
195+ propagateComposedEvents: true
197 property int oldX: 0
196 property int oldX: 0
198 onPressed: {
197 onPressed: {
199 oldX = mouseX;
198 oldX = mouseX;
@@ -204,6 +203,7 @@ FocusScope {
204 if (!root.draggingHorizontally) {
203 if (!root.draggingHorizontally) {
205 return;
204 return;
206 }
205 }
206+ propagateComposedEvents = false;
207 parent.interactive = false;
207 parent.interactive = false;
208 root.dragDistance += diff;
208 root.dragDistance += diff;
209 oldX = mouseX
209 oldX = mouseX
@@ -215,6 +215,13 @@ FocusScope {
215 root.draggingHorizontally = false;
215 root.draggingHorizontally = false;
216 parent.interactive = true;
216 parent.interactive = true;
217 }
217 }
218+ reactivateTimer.start();
219+ }
220+
221+ Timer {
222+ id: reactivateTimer
223+ interval: 0
224+ onTriggered: parent.propagateComposedEvents = true;
218 }
225 }
219 }
226 }
220
227