on xenial help sign in
cleanup
commit2e2f62f0897616e7bfba2360ed12b26dfbed23c5 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 15 Jan 2014, 11:40 (13 years ago) parente48b96b
1 file changed+1−33
qml/Stages/PhoneStage.qml+1−33
qml/Stages/PhoneStage.qml+1−33
@@ -202,12 +202,6 @@ Item {
202202 coverFlip.snap();
203203 }
204204 }
205−
206− Rectangle {
207− anchors.fill: parent
208− color: "green"
209− opacity: .4
210− }
211205 }
212206
213207 Rectangle {
@@ -226,7 +220,7 @@ Item {
226220 id: coverFlickable
227221 anchors.fill: root
228222 contentHeight: height
229− contentWidth: width * ApplicationManager.count * 0.5
223+ contentWidth: width * ApplicationManager.count
230224 flickableDirection: Qt.Horizontal
231225 enabled: coverFlip.visible
232226
@@ -342,12 +336,10 @@ Item {
342336 property real selectedXScale: 0
343337
344338 function select() {
345− print("selecting item, current translation:", appImage.xTranslation)
346339 appImage.selectedXTranslation = appImage.xTranslation;
347340 appImage.selectedAngle = appImage.angle;
348341 appImage.selectedXScale = appImage.xScale;
349342 appImage.selectedTranslatedProgress = appImage.translatedProgress;
350− print("set selected x translation", appImage.selectedXTranslation)
351343 appImage.isSelected = true;
352344 switchToAppAnimation.start();
353345 }
@@ -378,9 +370,6 @@ Item {
378370 default:
379371 if (appImage.progress > coverFlip.progressMarker1) {
380372 xTranslate = xTranslateEasing.value * xTranslateEasing.period;
381−
382− // make sure we stop at the left screen edge
383− // xTranslate = Math.max(xTranslate, minXTranslate)
384373 break;
385374 }
386375 }
@@ -423,23 +412,13 @@ Item {
423412 }
424413 // Intentionally no break here...
425414 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−
434415 newAngle = coverFlip.startAngle - (angleEasing.value * angleEasing.period);
435−
436416 // make sure we stop at the left screen edge
437417 newAngle = Math.max(newAngle, coverFlip.endAngle);
438418
439419 }
440420 if (appImage.isSelected) {
441421 var selectedAngleTranslate = selectedAngleEasing.value * selectedAngleEasing.period
442− print("selectedAngle", appImage.selectedAngle, "translate", selectedAngleTranslate)
443422 newAngle = appImage.selectedAngle - selectedAngleTranslate;
444423 }
445424
@@ -468,21 +447,12 @@ Item {
468447 }
469448 // Intentionally no break
470449 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−
478450 scale = coverFlip.maxScale - scaleEasing.value * scaleEasing.period;
479451 }
480−
481452 if (appImage.isSelected) {
482453 var selectedScaleTranslate = selectedScaleEasing.value * selectedScaleEasing.period
483454 scale = appImage.selectedXScale + selectedScaleTranslate;
484455 }
485−
486456 return Math.min(coverFlip.maxScale, Math.max(coverFlip.minScale, scale));
487457 }
488458
@@ -543,7 +513,6 @@ Item {
543513 MouseArea {
544514 anchors.fill: parent
545515 onClicked: {
546− print("clicked on index", index)
547516 appImage.select()
548517 }
549518 }
@@ -566,5 +535,4 @@ Item {
566535 }
567536 }
568537 }
569−
570538}