git.iko.soy/unity8
on xenial help sign in
cleanup
2e2f62fMichael Zanetti
qml/Stages/PhoneStage.qml+1−33
compare with xenial
unifiedsplit
@@ -202,12 +202,6 @@ Item {
202 coverFlip.snap();
202 coverFlip.snap();
203 }
203 }
204 }
204 }
205−
206− Rectangle {
207− anchors.fill: parent
208− color: "green"
209− opacity: .4
210− }
211 }
205 }
212
206
213 Rectangle {
207 Rectangle {
@@ -226,7 +220,7 @@ Item {
226 id: coverFlickable
220 id: coverFlickable
227 anchors.fill: root
221 anchors.fill: root
228 contentHeight: height
222 contentHeight: height
229− contentWidth: width * ApplicationManager.count * 0.5
223+ contentWidth: width * ApplicationManager.count
230 flickableDirection: Qt.Horizontal
224 flickableDirection: Qt.Horizontal
231 enabled: coverFlip.visible
225 enabled: coverFlip.visible
232
226
@@ -342,12 +336,10 @@ Item {
342 property real selectedXScale: 0
336 property real selectedXScale: 0
343
337
344 function select() {
338 function select() {
345− print("selecting item, current translation:", appImage.xTranslation)
346 appImage.selectedXTranslation = appImage.xTranslation;
339 appImage.selectedXTranslation = appImage.xTranslation;
347 appImage.selectedAngle = appImage.angle;
340 appImage.selectedAngle = appImage.angle;
348 appImage.selectedXScale = appImage.xScale;
341 appImage.selectedXScale = appImage.xScale;
349 appImage.selectedTranslatedProgress = appImage.translatedProgress;
342 appImage.selectedTranslatedProgress = appImage.translatedProgress;
350− print("set selected x translation", appImage.selectedXTranslation)
351 appImage.isSelected = true;
343 appImage.isSelected = true;
352 switchToAppAnimation.start();
344 switchToAppAnimation.start();
353 }
345 }
@@ -378,9 +370,6 @@ Item {
378 default:
370 default:
379 if (appImage.progress > coverFlip.progressMarker1) {
371 if (appImage.progress > coverFlip.progressMarker1) {
380 xTranslate = xTranslateEasing.value * xTranslateEasing.period;
372 xTranslate = xTranslateEasing.value * xTranslateEasing.period;
381−
382− // make sure we stop at the left screen edge
383− // xTranslate = Math.max(xTranslate, minXTranslate)
384 break;
373 break;
385 }
374 }
386 }
375 }
@@ -423,23 +412,13 @@ Item {
423 }
412 }
424 // Intentionally no break here...
413 // Intentionally no break here...
425 default:
414 default:
426− // var progress = appImage.progress;
427− // var angleDiff = coverFlip.startAngle - coverFlip.endAngle;
428− //// var progressDiff = coverFlip.progressMarker1 + index * 0.25 + 0.25
429− // var progressDiff = index
430− // // progress : progressDiff = angle : angleDiff
431− // newAngle = progress * angleDiff / progressDiff;
432− // newAngle = Math.max(coverFlip.endAngle, coverFlip.startAngle - newAngle)
433−
434 newAngle = coverFlip.startAngle - (angleEasing.value * angleEasing.period);
415 newAngle = coverFlip.startAngle - (angleEasing.value * angleEasing.period);
435−
436 // make sure we stop at the left screen edge
416 // make sure we stop at the left screen edge
437 newAngle = Math.max(newAngle, coverFlip.endAngle);
417 newAngle = Math.max(newAngle, coverFlip.endAngle);
438
418
439 }
419 }
440 if (appImage.isSelected) {
420 if (appImage.isSelected) {
441 var selectedAngleTranslate = selectedAngleEasing.value * selectedAngleEasing.period
421 var selectedAngleTranslate = selectedAngleEasing.value * selectedAngleEasing.period
442− print("selectedAngle", appImage.selectedAngle, "translate", selectedAngleTranslate)
443 newAngle = appImage.selectedAngle - selectedAngleTranslate;
422 newAngle = appImage.selectedAngle - selectedAngleTranslate;
444 }
423 }
445
424
@@ -468,21 +447,12 @@ Item {
468 }
447 }
469 // Intentionally no break
448 // Intentionally no break
470 default:
449 default:
471− // var scaleDiff = coverFlip.maxScale - coverFlip.minScale
472− //// var progressDiff = coverFlip.progressMarker1 + index * 0.25 + 0.25
473− // var progressDiff = index
474− // // progress : progressDiff = scale : scaleDiff
475− // scale = coverFlip.maxScale - (appImage.progress - coverFlip.progressMarker1) * scaleDiff / progressDiff
476− // break;
477−
478 scale = coverFlip.maxScale - scaleEasing.value * scaleEasing.period;
450 scale = coverFlip.maxScale - scaleEasing.value * scaleEasing.period;
479 }
451 }
480−
481 if (appImage.isSelected) {
452 if (appImage.isSelected) {
482 var selectedScaleTranslate = selectedScaleEasing.value * selectedScaleEasing.period
453 var selectedScaleTranslate = selectedScaleEasing.value * selectedScaleEasing.period
483 scale = appImage.selectedXScale + selectedScaleTranslate;
454 scale = appImage.selectedXScale + selectedScaleTranslate;
484 }
455 }
485−
486 return Math.min(coverFlip.maxScale, Math.max(coverFlip.minScale, scale));
456 return Math.min(coverFlip.maxScale, Math.max(coverFlip.minScale, scale));
487 }
457 }
488
458
@@ -543,7 +513,6 @@ Item {
543 MouseArea {
513 MouseArea {
544 anchors.fill: parent
514 anchors.fill: parent
545 onClicked: {
515 onClicked: {
546− print("clicked on index", index)
547 appImage.select()
516 appImage.select()
548 }
517 }
549 }
518 }
@@ -566,5 +535,4 @@ Item {
566 }
535 }
567 }
536 }
568 }
537 }
569−
570}
538}