on xenial help sign in
More fixes
d3cf8f2Andrea Cimitan
qml/Dash/Previews/PreviewOverlay.qml+2−2
@@ -99,8 +99,8 @@ Rectangle {
99 id: loader
99 id: loader
100 anchors.fill: parent
100 anchors.fill: parent
101
101
102− readonly property real initialXScale: initialAspectRatio >= 1 ? 1 : aspectRatio / initialAspectRatio
102+ readonly property real initialXScale: initialAspectRatio / aspectRatio >= 1 ? 1 : aspectRatio / initialAspectRatio
103− readonly property real initialYScale: initialAspectRatio >= 1 ? initialAspectRatio / aspectRatio : 1
103+ readonly property real initialYScale: initialAspectRatio / aspectRatio >= 1 ? initialAspectRatio / aspectRatio : 1
104 readonly property real xScale: loader.initialXScale - loader.initialXScale * overlay.progress + overlay.progress
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
105 readonly property real yScale: loader.initialYScale - loader.initialYScale * overlay.progress + overlay.progress
106
106
tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+1−1
@@ -22,7 +22,7 @@ import Unity.Test 0.1 as UT
22Rectangle {
22Rectangle {
23 id: root
23 id: root
24 width: units.gu(80)
24 width: units.gu(80)
25− height: units.gu(80)
25+ height: units.gu(70)
26 color: "lightgrey"
26 color: "lightgrey"
27
27
28 property var sourcesModel0: {
28 property var sourcesModel0: {