git.iko.soy/unity8
on xenial help sign in
use a more descriptive object name
commite6d68675a1e3c1b968779bb731294332c29a6314 authorhandsome_feng <445865575@qq.com> dateWed 27 May 2015, 09:20 (11 years ago) parent56f8af7
2 files changed+4−4
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml+1−1 tests/qmltests/Stages/tst_PhoneStage.qml+3−3
qml/Stages/PhoneStage.qml+1−1
@@ -451,7 +451,7 @@ Rectangle {
451451
452452 //eat touch events during the right edge gesture
453453 MouseArea {
454− objectName: "MouseArea"
454+ objectName: "eventEaterArea"
455455 anchors.fill: parent
456456 enabled: spreadDragArea.dragging
457457 }
tests/qmltests/Stages/tst_PhoneStage.qml+3−3
@@ -401,7 +401,7 @@ Item {
401401
402402 function test_cantAccessPhoneStageWhileRightEdgeGesture() {
403403 var spreadView = findChild(phoneStage, "spreadView");
404− var mouseArea = findChild(phoneStage, "MouseArea")
404+ var eventEaterArea = findChild(phoneStage, "eventEaterArea")
405405
406406 var startX = phoneStage.width - 2;
407407 var startY = phoneStage.height / 2;
@@ -411,11 +411,11 @@ Item {
411411 touchFlick(phoneStage, startX, startY, endX, endY,
412412 true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
413413
414− compare(mouseArea.enabled, true);
414+ compare(eventEaterArea.enabled, true);
415415
416416 touchRelease(phoneStage, endX, endY);
417417
418− compare(mouseArea.enabled, false);
418+ compare(eventEaterArea.enabled, false);
419419 }
420420
421421 function test_leftEdge_data() {