git.iko.soy/unity8
on xenial help sign in
revert the change that broke the camera app
053dbc5Michael Zanetti
qml/Stage/DecoratedWindow.qml+4−16
compare with xenial
unifiedsplit
@@ -99,16 +99,15 @@ FocusScope {
99 },
99 },
100 State {
100 State {
101 name: "normalSuspended"; when: root.scaleToPreviewProgress <= 0 && root.application.state !== ApplicationInfoInterface.Running
101 name: "normalSuspended"; when: root.scaleToPreviewProgress <= 0 && root.application.state !== ApplicationInfoInterface.Running
102+ extend: "normal"
102 PropertyChanges {
103 PropertyChanges {
103 target: root
104 target: root
104 implicitWidth: counterRotate ? applicationWindow.requestedHeight : applicationWindow.requestedWidth
105 implicitWidth: counterRotate ? applicationWindow.requestedHeight : applicationWindow.requestedWidth
105 implicitHeight: root.decorationHeight + (counterRotate ? applicationWindow.requestedWidth: applicationWindow.requestedHeight)
106 implicitHeight: root.decorationHeight + (counterRotate ? applicationWindow.requestedWidth: applicationWindow.requestedHeight)
106 }
107 }
107−// PropertyChanges { target: applicationWindow; anchors.topMargin: (root.height - applicationWindow.implicitHeight) / 2 }
108−// PropertyChanges { target: dropShadow; anchors.topMargin: (root.height - applicationWindow.implicitHeight) / 2 }
109 },
108 },
110 State {
109 State {
111− name: "preview"; when: root.scaleToPreviewProgress > 0 && root.application.state === ApplicationInfoInterface.Running
110+ name: "preview"; when: root.scaleToPreviewProgress > 0
112 PropertyChanges {
111 PropertyChanges {
113 target: root
112 target: root
114 implicitWidth: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedWidth, root.scaleToPreviewSize, root.scaleToPreviewProgress)
113 implicitWidth: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedWidth, root.scaleToPreviewSize, root.scaleToPreviewProgress)
@@ -122,16 +121,6 @@ FocusScope {
122 height: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, applicationWindow.minSize, root.scaleToPreviewProgress)
121 height: MathUtils.linearAnimation(0, 1, applicationWindow.oldRequestedHeight, applicationWindow.minSize, root.scaleToPreviewProgress)
123 itemScale: root.implicitWidth / width
122 itemScale: root.implicitWidth / width
124 }
123 }
125− },
126− State {
127− name: "previewSuspended"; when: root.scaleToPreviewProgress > 0 && root.application.state !== ApplicationInfoInterface.Running
128− extend: "preview"
129− PropertyChanges { target: applicationWindow;
130− anchors.verticalCenterOffset: applicationWindow.implicitHeight < applicationWindow.height ?
131− (root.height / applicationWindow.itemScale - applicationWindow.implicitHeight) / 2
132− : (root.height / applicationWindow.itemScale - applicationWindow.height) / 2
133− }
134−// PropertyChanges { target: dropShadow; anchors.topMargin: (root.height - root.implicitHeight) / 2 * (1 - root.scaleToPreviewProgress) }
135 }
124 }
136 ]
125 ]
137 }
126 }
@@ -195,9 +184,9 @@ FocusScope {
195 ApplicationWindow {
184 ApplicationWindow {
196 id: applicationWindow
185 id: applicationWindow
197 objectName: "appWindow"
186 objectName: "appWindow"
198− anchors.verticalCenter: parent.verticalCenter
199− anchors.verticalCenterOffset: (root.decorationHeight * Math.min(1, root.showDecoration)) / 2
200 anchors.left: parent.left
187 anchors.left: parent.left
188+ anchors.top: parent.top
189+ anchors.topMargin: root.decorationHeight * Math.min(1, root.showDecoration)
201 width: implicitWidth
190 width: implicitWidth
202 height: implicitHeight
191 height: implicitHeight
203 requestedHeight: !counterRotate ? root.requestedHeight - d.requestedDecorationHeight : root.requestedWidth
192 requestedHeight: !counterRotate ? root.requestedHeight - d.requestedDecorationHeight : root.requestedWidth
@@ -232,7 +221,6 @@ FocusScope {
232 angle: rotationAngle
221 angle: rotationAngle
233 },
222 },
234 Scale {
223 Scale {
235− origin.y: (applicationWindow.implicitHeight < applicationWindow.height ? applicationWindow.implicitHeight : applicationWindow.height) / 2
236 xScale: applicationWindow.itemScale
224 xScale: applicationWindow.itemScale
237 yScale: applicationWindow.itemScale
225 yScale: applicationWindow.itemScale
238 }
226 }