adca938 · unity8 · git.iko.soy

on xenial help sign in

This should not be here, it's part of a bad merge

adca938Albert Astals12 years ago

qml/Dash/GenericScopeView.qml−21

@@ -345,27 +345,6 @@ FocusScope {

345 }

346 Connections {

347 target: categoryView

348− onExpandedCategoryItemChanged: {

349− collapseAllButExpandedCategory();

350− }

351− function collapseAllButExpandedCategory() {

352− var item = rendererLoader.item;

353− if (baseItem.expandable) {

354− var shouldExpand = baseItem === categoryView.expandedCategoryItem;

355− if (shouldExpand != baseItem.expanded) {

356− // If the filter animation will be seen start it, otherwise, just flip the switch

357− var shrinkingVisible = !shouldExpand && y + item.collapsedHeight + seeAll.height < categoryView.height;

358− var growingVisible = shouldExpand && y + height < categoryView.height;

359− if (!subPageLoader.open || shouldExpand) {

360− var animate = shrinkingVisible || growingVisible;

361− baseItem.expand(shouldExpand, animate)

362− if (shouldExpand && !subPageLoader.open) {

363− categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);

364− }

365− }

366− }

367− }

368− }

369 onOriginYChanged: rendererLoader.updateRanges();

348 onOriginYChanged: rendererLoader.updateRanges();

370 onContentYChanged: rendererLoader.updateRanges();

349 onContentYChanged: rendererLoader.updateRanges();

371 onHeightChanged: rendererLoader.updateRanges();

350 onHeightChanged: rendererLoader.updateRanges();