git.iko.soy/unity8
on xenial help sign in
Bug swap
3e105e0Dalton Durst
qml/Launcher/Drawer.qml+8−9
compare with xenial
unifiedsplit
@@ -32,6 +32,7 @@ FocusScope {
32
32
33 signal applicationSelected(string appId)
33 signal applicationSelected(string appId)
34
34
35+ property bool firstOpen: true
35 property bool draggingHorizontally: false
36 property bool draggingHorizontally: false
36 property int dragDistance: 0
37 property int dragDistance: 0
37
38
@@ -190,11 +191,17 @@ FocusScope {
190 }
191 }
191
192
192 MouseArea {
193 MouseArea {
194+ id: horizontalDragDetector
193 parent: listLoader.item ? listLoader.item : null
195 parent: listLoader.item ? listLoader.item : null
194 anchors.fill: parent
196 anchors.fill: parent
195 propagateComposedEvents: true
197 propagateComposedEvents: true
196 property int oldX: 0
198 property int oldX: 0
197 onPressed: {
199 onPressed: {
200+ if (root.firstOpen) {
201+ mouse.accepted = false;
202+ root.firstOpen = false;
203+ return;
204+ }
198 oldX = mouseX;
205 oldX = mouseX;
199 }
206 }
200 onMouseXChanged: {
207 onMouseXChanged: {
@@ -203,7 +210,6 @@ FocusScope {
203 if (!root.draggingHorizontally) {
210 if (!root.draggingHorizontally) {
204 return;
211 return;
205 }
212 }
206− propagateComposedEvents = false;
207 parent.interactive = false;
213 parent.interactive = false;
208 root.dragDistance += diff;
214 root.dragDistance += diff;
209 oldX = mouseX
215 oldX = mouseX
@@ -215,13 +221,6 @@ FocusScope {
215 root.draggingHorizontally = false;
221 root.draggingHorizontally = false;
216 parent.interactive = true;
222 parent.interactive = true;
217 }
223 }
218− reactivateTimer.start();
219− }
220−
221− Timer {
222− id: reactivateTimer
223− interval: 0
224− onTriggered: parent.propagateComposedEvents = true;
225 }
224 }
226 }
225 }
227
226
@@ -318,7 +317,7 @@ FocusScope {
318 anchors { left: parent.left; top: categoryNameLabel.bottom; right: parent.right; topMargin: units.gu(1) }
317 anchors { left: parent.left; top: categoryNameLabel.bottom; right: parent.right; topMargin: units.gu(1) }
319 height: rows * delegateHeight
318 height: rows * delegateHeight
320
319
321− interactive: true
320+ interactive: false
322 focus: index == aToZListView.currentIndex
321 focus: index == aToZListView.currentIndex
323
322
324 model: AppDrawerProxyModel {
323 model: AppDrawerProxyModel {