git.iko.soy/unity8
on xenial help sign in
use a more descriptive object name
e6d6867handsome_feng
qml/Stages/PhoneStage.qml+1−1
compare with xenial
unifiedsplit
@@ -451,7 +451,7 @@ Rectangle {
451
451
452 //eat touch events during the right edge gesture
452 //eat touch events during the right edge gesture
453 MouseArea {
453 MouseArea {
454− objectName: "MouseArea"
454+ objectName: "eventEaterArea"
455 anchors.fill: parent
455 anchors.fill: parent
456 enabled: spreadDragArea.dragging
456 enabled: spreadDragArea.dragging
457 }
457 }
tests/qmltests/Stages/tst_PhoneStage.qml+3−3
@@ -401,7 +401,7 @@ Item {
401
401
402 function test_cantAccessPhoneStageWhileRightEdgeGesture() {
402 function test_cantAccessPhoneStageWhileRightEdgeGesture() {
403 var spreadView = findChild(phoneStage, "spreadView");
403 var spreadView = findChild(phoneStage, "spreadView");
404− var mouseArea = findChild(phoneStage, "MouseArea")
404+ var eventEaterArea = findChild(phoneStage, "eventEaterArea")
405
405
406 var startX = phoneStage.width - 2;
406 var startX = phoneStage.width - 2;
407 var startY = phoneStage.height / 2;
407 var startY = phoneStage.height / 2;
@@ -411,11 +411,11 @@ Item {
411 touchFlick(phoneStage, startX, startY, endX, endY,
411 touchFlick(phoneStage, startX, startY, endX, endY,
412 true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
412 true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
413
413
414− compare(mouseArea.enabled, true);
414+ compare(eventEaterArea.enabled, true);
415
415
416 touchRelease(phoneStage, endX, endY);
416 touchRelease(phoneStage, endX, endY);
417
417
418− compare(mouseArea.enabled, false);
418+ compare(eventEaterArea.enabled, false);
419 }
419 }
420
420
421 function test_leftEdge_data() {
421 function test_leftEdge_data() {