on xenial help sign in
Merge testIndicatorsMenuFix
commit01b4aca39e3b5bb3417fb3dc16ab60c82c06580b authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 11 Dec 2015, 10:34 (11 years ago) parent1eb958321254d7
1 file changed+3−3
tests/qmltests/Panel/tst_IndicatorsMenu.qml+3−3
tests/qmltests/Panel/tst_IndicatorsMenu.qml+3−3
@@ -243,12 +243,12 @@ IndicatorTest {
243243
244244 // next time position will have moved.
245245 var nextItem = get_indicator_item(1);
246− var nextItemMappedPosition = root.mapFromItem(nextItem, nextItem.width/2, nextItem.height/2);
246+ var nextItemMappedPositionX = firstItemMappedPosition.x + firstItem.width;
247247
248248 // 1) Flick mouse down to bottom
249249 touchFlick(indicatorsMenu,
250250 firstItemMappedPosition.x, indicatorsMenu.minimizedPanelHeight * 2,
251− nextItemMappedPosition.x, indicatorsMenu.openedHeight / 3,
251+ nextItemMappedPositionX, indicatorsMenu.openedHeight / 3,
252252 false /* beginTouch */, false /* endTouch */,
253253 units.gu(50) /* speed */, 5 /* iterations */); // more samples needed for accurate velocity
254254
@@ -256,7 +256,7 @@ IndicatorTest {
256256 // after waiting in the same spot with touch down, it should update to the next item.
257257 tryCompare(indicatorItemRow, "currentItem", nextItem);
258258
259− touchRelease(indicatorsMenu, nextItemMappedPosition.x, indicatorsMenu.openedHeight / 3);
259+ touchRelease(indicatorsMenu, nextItemMappedPositionX, indicatorsMenu.openedHeight / 3);
260260 }
261261 }
262262}