git.iko.soy/unity8
on xenial help sign in
fix bad merge
1a85ae9Michael Zanetti
qml/Stages/DesktopStage.qml+1−8
compare with xenial
unifiedsplit
@@ -330,14 +330,6 @@ AbstractStage {
330 name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
330 name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
331 PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
331 PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
332 },
332 },
333− State {
334− name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
335− PropertyChanges { target: appDelegate; x: 0; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
336− },
337− State {
338− name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
339− PropertyChanges { target: appDelegate; x: root.width/2; y: units.gu(3); width: root.width/2; height: root.height - units.gu(3) }
340− },
341 State {
333 State {
342 name: "minimized"; when: appDelegate.minimized
334 name: "minimized"; when: appDelegate.minimized
343 PropertyChanges {
335 PropertyChanges {
@@ -353,6 +345,7 @@ AbstractStage {
353 transitions: [
345 transitions: [
354 Transition {
346 Transition {
355 to: "normal"
347 to: "normal"
348+ enabled: appDelegate.animationsEnabled
356 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
349 PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
357 PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
350 PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
358 },
351 },
qml/Stages/WindowResizeArea.qml−26
@@ -39,32 +39,6 @@ MouseArea {
39 property int screenWidth: 0
39 property int screenWidth: 0
40 property int screenHeight: 0
40 property int screenHeight: 0
41
41
42− QtObject {
43− id: priv
44−
45− property int normalX: 0
46− property int normalY: 0
47− property int normalWidth: 0
48− property int normalHeight: 0
49−
50− function updateNormalGeometry() {
51− if (root.target.state == "normal") {
52− normalX = root.target.x
53− normalY = root.target.y
54− normalWidth = root.target.width
55− normalHeight = root.target.height
56− }
57− }
58− }
59−
60− Connections {
61− target: root.target
62− onXChanged: priv.updateNormalGeometry();
63− onYChanged: priv.updateNormalGeometry();
64− onWidthChanged: priv.updateNormalGeometry();
65− onHeightChanged: priv.updateNormalGeometry();
66− }
67−
68 QtObject {
42 QtObject {
69 id: priv
43 id: priv
70 objectName: "priv"
44 objectName: "priv"
tests/qmltests/tst_Shell.qml+2−2
@@ -344,9 +344,9 @@ Rectangle {
344 var app2 = ApplicationManager.startApplication("webbrowser-app")
344 var app2 = ApplicationManager.startApplication("webbrowser-app")
345 var app3 = ApplicationManager.startApplication("camera-app")
345 var app3 = ApplicationManager.startApplication("camera-app")
346 var app4 = ApplicationManager.startApplication("facebook-webapp")
346 var app4 = ApplicationManager.startApplication("facebook-webapp")
347− var app7 = ApplicationManager.startApplication("camera-app")
347+ var app5 = ApplicationManager.startApplication("camera-app")
348 var app6 = ApplicationManager.startApplication("gallery-app")
348 var app6 = ApplicationManager.startApplication("gallery-app")
349− var app5 = ApplicationManager.startApplication("calendar-app")
349+ var app7 = ApplicationManager.startApplication("calendar-app")
350 waitUntilAppWindowIsFullyLoaded(app7);
350 waitUntilAppWindowIsFullyLoaded(app7);
351 }
351 }
352
352