@@ -99,10 +99,13 @@ Rectangle {
99 id: loader
99 id: loader
100 anchors.fill: parent
100 anchors.fill: parent
102− readonly property real initialXScale: initialAspectRatio / aspectRatio >= 1 ? 1 : aspectRatio / initialAspectRatio
102+ readonly property bool verticalScaling: initialAspectRatio / aspectRatio >= 1
103+ readonly property real initialXScale: verticalScaling ? 1 : aspectRatio / initialAspectRatio
103− readonly property real initialYScale: initialAspectRatio / aspectRatio >= 1 ? initialAspectRatio / aspectRatio : 1
104+ readonly property real initialYScale: verticalScaling ? initialAspectRatio / aspectRatio : 1
104− readonly property real xScale: loader.initialXScale - loader.initialXScale * overlay.progress + overlay.progress
105+ readonly property real xScale: verticalScaling ? loader.initialXScale - loader.initialXScale * overlay.progress + overlay.progress :
106+ loader.yScale * overlay.yScale / overlay.xScale
107+ readonly property real yScale: verticalScaling ? loader.xScale * overlay.xScale / overlay.yScale :
105− readonly property real yScale: loader.initialYScale - loader.initialYScale * overlay.progress + overlay.progress
108+ loader.initialYScale - loader.initialYScale * overlay.progress + overlay.progress
107 transform: Scale {
110 transform: Scale {
108 origin.x: parent.width / 2
111 origin.x: parent.width / 2