on xenial help sign in
Fix aspect ratio overlay
commitef7a486cfb0d59b60f7a89b86d79fa97a87965d0 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 9 Mar 2015, 12:30 (12 years ago) parentd3cf8f2
1 file changed+7−4
qml/Dash/Previews/PreviewOverlay.qml+7−4
qml/Dash/Previews/PreviewOverlay.qml+7−4
@@ -99,10 +99,13 @@ Rectangle {
9999 id: loader
100100 anchors.fill: parent
101101
102− readonly property real initialXScale: initialAspectRatio / aspectRatio >= 1 ? 1 : aspectRatio / initialAspectRatio
103− readonly property real initialYScale: initialAspectRatio / aspectRatio >= 1 ? initialAspectRatio / aspectRatio : 1
104− readonly property real xScale: loader.initialXScale - loader.initialXScale * overlay.progress + overlay.progress
105− readonly property real yScale: loader.initialYScale - loader.initialYScale * overlay.progress + overlay.progress
102+ readonly property bool verticalScaling: initialAspectRatio / aspectRatio >= 1
103+ readonly property real initialXScale: verticalScaling ? 1 : aspectRatio / initialAspectRatio
104+ readonly property real initialYScale: verticalScaling ? initialAspectRatio / aspectRatio : 1
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 :
108+ loader.initialYScale - loader.initialYScale * overlay.progress + overlay.progress
106109
107110 transform: Scale {
108111 origin.x: parent.width / 2