git.iko.soy/unity8
on xenial help sign in
fix preview background positioning
commit86ff26f58732c2465fd6de6eb4f4d5af7ba5400d authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 13 Nov 2013, 14:49 (13 years ago) parentb097fab
2 files changed+28−6
compare with xenial
unifiedsplit
Dash/GenericScopeView.qml+11−4 tests/qmltests/Dash/tst_GenericScopeView.qml+17−2
Dash/GenericScopeView.qml+11−4
@@ -151,7 +151,7 @@ ScopeView {
151151 }
152152 }
153153 onPressAndHold: {
154− effect.positionPx = mapToItem(categoryView, 0, itemY).y
154+ effect.positionPx = Math.max(mapToItem(categoryView, 0, itemY).y, pageHeader.height + units.gu(5));
155155 previewListView.categoryId = categoryId
156156 previewListView.categoryDelegate = rendererLoader.item
157157 previewListView.model = model;
@@ -393,12 +393,19 @@ ScopeView {
393393
394394 if (!init && model !== undefined) {
395395 var item = model.get(currentIndex)
396− scopeView.scope.preview( item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
396+ scopeView.scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
397397 }
398398
399399 var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
400+
401+ // Find new contentY and effect.postionPx
400402 var newContentY = itemY - effect.positionPx - categoryDelegate.verticalSpacing;
401− var effectAdjust = effect.positionPx;
403+
404+ // Make sure the item is not covered by a header. Move the effect split down if necessary
405+ var headerHeight = pageHeader.height + units.gu(5); // sectionHeader's height
406+ var effectAdjust = Math.max(effect.positionPx, headerHeight);
407+
408+ // Make sure we don't overscroll the listview. If yes, adjust effect position
402409 if (newContentY < 0) {
403410 effectAdjust += newContentY;
404411 newContentY = 0;
@@ -409,7 +416,7 @@ ScopeView {
409416 }
410417
411418 effect.positionPx = effectAdjust;
412− categoryView.contentY = newContentY - categoryView.originY;
419+ categoryView.contentY = newContentY;
413420 }
414421
415422 property bool open: false
tests/qmltests/Dash/tst_GenericScopeView.qml+17−2
@@ -132,7 +132,23 @@ Item {
132132 tryCompare(previewListView, "open", false);
133133 }
134134
135− function test_previewCycleOne() {
135+ function test_hiddenPreviewOpen() {
136+ var categoryListView = findChild(genericScopeView, "categoryListView");
137+ categoryListView.positionAtBeginning();
138+ waitForRendering(categoryListView);
139+ categoryListView.flick(0, -units.gu(80));
140+ tryCompare(categoryListView.flicking, false);
141+
142+ var tile = findChild(genericScopeView, "delegate0");
143+ mouseClick(tile, tile.width / 2, tile.height - 1);
144+ var openEffect = findChild(genericScopeView, "openEffect");
145+ tryCompare(openEffect, "gap", 1);
146+
147+ var pageHeader = findChild(genericScopeView, "pageHeader");
148+ verify(openEffect.positionPx >= pageHeader.height + units.gu(5));
149+ }
150+
151+ function test_previewCycle() {
136152 var previewListView = findChild(genericScopeView, "previewListView");
137153 tryCompare(previewListView, "open", false);
138154
@@ -173,7 +189,6 @@ Item {
173189
174190 checkArrowPosition(i);
175191 }
176−
177192 closePreview();
178193 }
179194