on xenial help sign in
fix shadow scale sync
102b9a7Michael Zanetti
qml/Stages/DecoratedWindow.qml+2−3
@@ -95,7 +95,7 @@ FocusScope {
95
95
96 BorderImage {
96 BorderImage {
97 anchors {
97 anchors {
98− fill: decoratedWindow
98+ fill: root
99 margins: active ? -units.gu(2) : -units.gu(1.5)
99 margins: active ? -units.gu(2) : -units.gu(1.5)
100 }
100 }
101 source: "graphics/dropshadow2gu.sci"
101 source: "graphics/dropshadow2gu.sci"
@@ -153,8 +153,7 @@ FocusScope {
153 implicitHeight: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, root.scaleToPreviewSize, root.scaleToPreviewProgress)
153 implicitHeight: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, root.scaleToPreviewSize, root.scaleToPreviewProgress)
154 width: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedWidth, applicationWindow.minSize, root.scaleToPreviewProgress)
154 width: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedWidth, applicationWindow.minSize, root.scaleToPreviewProgress)
155 height: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, applicationWindow.minSize, root.scaleToPreviewProgress)
155 height: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, applicationWindow.minSize, root.scaleToPreviewProgress)
156− // This is not 100% matching as it animates to an animated height, but close enough for the speed the animation plays
156+ itemScale: implicitWidth / width
157− itemScale: MathUtils.linearAnimation(0, 1, 1, 1.0 * root.scaleToPreviewSize / Math.min(applicationWindow.height, applicationWindow.width), root.scaleToPreviewProgress)
158 }
157 }
159 }
158 }
160 ]
159 ]