git.iko.soy/unity8
on xenial help sign in
more work
7c3c9c7Michael Zanetti
qml/Stages/ApplicationWindow.qml−11
compare with xenial
unifiedsplit
@@ -28,17 +28,6 @@ FocusScope {
28 property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
28 property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
29 readonly property string title: surface && surface.name !== "" ? surface.name : d.name
29 readonly property string title: surface && surface.name !== "" ? surface.name : d.name
30
30
31− // overridable from outside
32− property bool fullscreen: {
33− if (surface) {
34− return surface.state === Mir.FullscreenState;
35− } else if (application) {
36− return application.fullscreen;
37− } else {
38− return false;
39− }
40− }
41−
42 // to be set from outside
31 // to be set from outside
43 property QtObject surface
32 property QtObject surface
44 property QtObject application
33 property QtObject application
qml/Stages/DecoratedWindow.qml+65−31
@@ -22,31 +22,32 @@ FocusScope {
22 id: root
22 id: root
23
23
24 implicitWidth: !counterRotate ? applicationWindow.implicitWidth : applicationWindow.implicitHeight
24 implicitWidth: !counterRotate ? applicationWindow.implicitWidth : applicationWindow.implicitHeight
25− implicitHeight: visibleDecorationHeight + (!counterRotate ? applicationWindow.implicitHeight : applicationWindow.implicitWidth)
25+ implicitHeight: decorationHeight + (!counterRotate ? applicationWindow.implicitHeight : applicationWindow.implicitWidth)
26
26
27 property alias application: applicationWindow.application
27 property alias application: applicationWindow.application
28 property alias surface: applicationWindow.surface
28 property alias surface: applicationWindow.surface
29 property alias active: decoration.active
29 property alias active: decoration.active
30 readonly property alias title: applicationWindow.title
30 readonly property alias title: applicationWindow.title
31− property alias fullscreen: applicationWindow.fullscreen
32 property alias maximizeButtonShown: decoration.maximizeButtonShown
31 property alias maximizeButtonShown: decoration.maximizeButtonShown
33
32
34− // Whether we want it to sho in general
33+ // Changing this will actually add/remove a decoration, meaning, requestedHeight will take the decoration into account.
34+ property bool hasDecoration: true
35+ // This will temporarily show/hide the decoration without actually changing the surface's dimensions
35 property bool showDecoration: true
36 property bool showDecoration: true
36− // Whether it is actually shown. Even if showDecoration is true, this might be false for other reasons (e.g. app is fullscreened)
37+ property bool showHighlight: false
37− readonly property bool decorationShown: showDecoration && !fullscreen
38− property bool highlightShown: false
39 property real shadowOpacity: 1
38 property real shadowOpacity: 1
40
39
41 property real requestedWidth
40 property real requestedWidth
42 property real requestedHeight
41 property real requestedHeight
42+ property bool scaleToPreview
43+ property int scaleToPreviewSize: units.gu(30)
43
44
44 property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle
45 property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle
45− readonly property real visibleDecorationHeight: root.decorationShown ? decoration.height : 0
46+ readonly property real decorationHeight: Math.min(d.visibleDecorationHeight, d.requestedDecorationHeight)
46 readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180
47 readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180
47
48
48 readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight
49 readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight
49− readonly property int minimumHeight: visibleDecorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)
50+ readonly property int minimumHeight: decorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)
50 readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight
51 readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight
51 readonly property int maximumHeight: (root.decorationShown && applicationWindow.maximumHeight > 0 ? decoration.height : 0)
52 readonly property int maximumHeight: (root.decorationShown && applicationWindow.maximumHeight > 0 ? decoration.height : 0)
52 + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)
53 + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)
@@ -62,29 +63,28 @@ FocusScope {
62 signal minimizeClicked()
63 signal minimizeClicked()
63 signal decorationPressed()
64 signal decorationPressed()
64
65
66+ QtObject {
67+ id: d
68+ property int requestedDecorationHeight: root.hasDecoration && root.hasDecoration ? decoration.height : 0
69+ Behavior on requestedDecorationHeight { UbuntuNumberAnimation { duration: priv.animationDuration } }
70+
71+ property int visibleDecorationHeight: root.showDecoration && root.hasDecoration ? decoration.height : 0
72+ Behavior on visibleDecorationHeight { UbuntuNumberAnimation { duration: priv.animationDuration } }
73+ }
74+
65 Rectangle {
75 Rectangle {
66 id: selectionHighlight
76 id: selectionHighlight
67 anchors.fill: parent
77 anchors.fill: parent
68 anchors.margins: -units.gu(1)
78 anchors.margins: -units.gu(1)
69 color: "white"
79 color: "white"
70− opacity: highlightShown ? 0.15 : 0
80+ opacity: showHighlight ? 0.15 : 0
71 }
81 }
72
82
73 Rectangle {
83 Rectangle {
74 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
84 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
75 height: units.dp(2)
85 height: units.dp(2)
76 color: theme.palette.normal.focus
86 color: theme.palette.normal.focus
77− visible: highlightShown
87+ visible: showHighlight
78− }
79−
80− BorderImage {
81− anchors {
82− fill: root
83− margins: active ? -units.gu(2) : -units.gu(1.5)
84− }
85− source: "graphics/dropshadow2gu.sci"
86− opacity: root.shadowOpacity * .3
87− visible: !fullscreen
88 }
88 }
89
89
90 WindowDecoration {
90 WindowDecoration {
@@ -95,7 +95,10 @@ FocusScope {
95 height: units.gu(3)
95 height: units.gu(3)
96 width: root.width
96 width: root.width
97 title: applicationWindow.title
97 title: applicationWindow.title
98− visible: root.decorationShown
98+ opacity: root.hasDecoration && root.showDecoration ? 1 : 0
99+
100+ // FIXME: priv.animationDuration reaches out of context... neads cleanup before landing
101+ Behavior on opacity { UbuntuNumberAnimation { duration: priv.animationDuration } }
99
102
100 onCloseClicked: root.closeClicked();
103 onCloseClicked: root.closeClicked();
101 onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
104 onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
@@ -109,21 +112,44 @@ FocusScope {
109 id: applicationWindow
112 id: applicationWindow
110 objectName: "appWindow"
113 objectName: "appWindow"
111 anchors.top: parent.top
114 anchors.top: parent.top
112− anchors.topMargin: root.decorationShown ? decoration.height : 0
115+ anchors.topMargin: root.decorationHeight
113 anchors.left: parent.left
116 anchors.left: parent.left
114 width: root.width
117 width: root.width
115 height: root.height - anchors.topMargin
118 height: root.height - anchors.topMargin
116− readonly property real requestedHeightMinusDecoration: root.requestedHeight - root.visibleDecorationHeight
119+ requestedHeight: !counterRotate ? root.requestedHeight - d.requestedDecorationHeight : root.requestedWidth
117− requestedHeight: !counterRotate ? requestedHeightMinusDecoration : root.requestedWidth
120+ requestedWidth: !counterRotate ? root.requestedWidth : root.requestedHeight - d.requestedDecorationHeight
118− requestedWidth: !counterRotate ? root.requestedWidth : requestedHeightMinusDecoration
121+ property int oldRequestedWidth: requestedWidth
122+ property int oldRequestedHeight: requestedHeight
123+ onRequestedWidthChanged: oldRequestedWidth = requestedWidth
124+ onRequestedHeightChanged: oldRequestedHeight = requestedHeight
119 interactive: true
125 interactive: true
120 focus: true
126 focus: true
121
127
122− Behavior on anchors.topMargin {
128+ property real itemScale: 1
123− UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
129+ states: [
130+ State {
131+ name: "preview"; when: root.scaleToPreview
132+ PropertyChanges {
133+ target: applicationWindow;
134+ requestedWidth: applicationWindow.oldRequestedWidth
135+ requestedHeight: applicationWindow.oldRequestedHeight
136+ implicitWidth: root.scaleToPreviewSize
137+ implicitHeight: root.scaleToPreviewSize
138+ width: Math.min(root.scaleToPreviewSize, Math.min(applicationWindow.requestedHeight, applicationWindow.requestedWidth))
139+ height: Math.min(root.scaleToPreviewSize, Math.min(applicationWindow.requestedHeight, applicationWindow.requestedWidth))
140+ itemScale: 1.0 * root.scaleToPreviewSize / applicationWindow.width
141+ }
142+ }
143+ ]
144+ transitions: [
145+ Transition {
146+ from: "*"; to: "*"
147+ UbuntuNumberAnimation { properties: "width,height,implicitWidth,implicitHeight"; duration: priv.animationDuration }
124− }
148+ }
125−
149+ ]
150+
126− transform: Rotation {
151+ transform: [
152+ Rotation {
127 readonly property int rotationAngle: applicationWindow.application &&
153 readonly property int rotationAngle: applicationWindow.application &&
128 applicationWindow.application.rotatesWindowContents
154 applicationWindow.application.rotatesWindowContents
129 ? ((360 - applicationWindow.surfaceOrientationAngle) % 360) : 0
155 ? ((360 - applicationWindow.surfaceOrientationAngle) % 360) : 0
@@ -140,6 +166,14 @@ FocusScope {
140 else return 0;
166 else return 0;
141 }
167 }
142 angle: rotationAngle
168 angle: rotationAngle
143− }
169+ },
170+ Scale {
171+ xScale: applicationWindow.itemScale
172+ yScale: applicationWindow.itemScale
173+ }
174+
175+ ]
144 }
176 }
177+
178+ Rectangle { anchors.fill: parent; color: "blue"; opacity: .3 }
145}
179}
qml/Stages/DesktopStage.qml+37−24
@@ -128,7 +128,7 @@ AbstractStage {
128 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
128 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
129
129
130 property bool goneToSpread: false
130 property bool goneToSpread: false
131− property int animationDuration: UbuntuAnimation.FastDuration// 4000//UbuntuAnimation.SleepyDuration
131+ property int animationDuration: /*UbuntuAnimation.FastDuration//*/ 4000//UbuntuAnimation.SleepyDuration
132
132
133 function updateForegroundMaximizedApp() {
133 function updateForegroundMaximizedApp() {
134 var found = false;
134 var found = false;
@@ -350,7 +350,7 @@ AbstractStage {
350 readonly property bool maximizedHorizontally: windowState & WindowStateStorage.WindowStateMaximizedHorizontally
350 readonly property bool maximizedHorizontally: windowState & WindowStateStorage.WindowStateMaximizedHorizontally
351 readonly property bool maximizedVertically: windowState & WindowStateStorage.WindowStateMaximizedVertically
351 readonly property bool maximizedVertically: windowState & WindowStateStorage.WindowStateMaximizedVertically
352 readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
352 readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
353− readonly property alias fullscreen: decoratedWindow.fullscreen
353+ readonly property bool fullscreen: state == "fullscreen"
354
354
355 property int windowState: WindowStateStorage.WindowStateNormal
355 property int windowState: WindowStateStorage.WindowStateNormal
356 property bool animationsEnabled: true
356 property bool animationsEnabled: true
@@ -569,16 +569,15 @@ AbstractStage {
569 x: spreadMaths.animatedX
569 x: spreadMaths.animatedX
570 y: spreadMaths.animatedY
570 y: spreadMaths.animatedY
571 z: index
571 z: index
572− height: decoratedWindow.height + windowInfoItem.height + units.gu(2)
572+ height: spreadMaths.tileSize + windowInfoItem.height + units.gu(2)
573 requestedWidth: decoratedWindow.oldRequestedWidth
573 requestedWidth: decoratedWindow.oldRequestedWidth
574 requestedHeight: decoratedWindow.oldRequestedHeight
574 requestedHeight: decoratedWindow.oldRequestedHeight
575 }
575 }
576 PropertyChanges {
576 PropertyChanges {
577 target: decoratedWindow;
577 target: decoratedWindow;
578 showDecoration: false;
578 showDecoration: false;
579− height: units.gu(40)
580− width: units.gu(40)
581 angle: spreadMaths.animatedAngle
579 angle: spreadMaths.animatedAngle
580+ scaleToPreview: true
582 }
581 }
583 PropertyChanges { target: inputBlocker; enabled: true }
582 PropertyChanges { target: inputBlocker; enabled: true }
584 PropertyChanges { target: windowInfoItem; opacity: 1 }
583 PropertyChanges { target: windowInfoItem; opacity: 1 }
@@ -618,7 +617,7 @@ AbstractStage {
618 }
617 }
619 PropertyChanges {
618 PropertyChanges {
620 target: decoratedWindow
619 target: decoratedWindow
621− showDecoration: false
620+ hasDecoration: false
622 }
621 }
623 PropertyChanges {
622 PropertyChanges {
624 target: resizeArea
623 target: resizeArea
@@ -638,14 +637,18 @@ AbstractStage {
638 }
637 }
639 },
638 },
640 State {
639 State {
641− name: "fullscreen"; when: decoratedWindow.fullscreen && !appDelegate.minimized
640+ name: "fullscreen"; when: surface ? surface.state === Mir.FullscreenState : application.fullscreen && !appDelegate.minimized
642 PropertyChanges {
641 PropertyChanges {
643 target: appDelegate;
642 target: appDelegate;
644− x: rotation == 0 ? 0 : (parent.width - width) / 2 + (shellOrientationAngle == 90 ? -PanelState.panelHeight : PanelState.panelHeight)
643+ x: rotation == 0 ? 0 : (parent.width - width) / 2 + (shellOrientationAngle == 90 ? 0 : PanelState.panelHeight)
645− y: rotation == 0 ? -PanelState.panelHeight : (parent.height - height) / 2
644+ y: rotation == 0 ? 0 : (parent.height - height) / 2
646 requestedWidth: appContainer.width;
645 requestedWidth: appContainer.width;
647 requestedHeight: appContainer.height;
646 requestedHeight: appContainer.height;
648 }
647 }
648+ PropertyChanges {
649+ target: decoratedWindow
650+ hasDecoration: false
651+ }
649 },
652 },
650 State {
653 State {
651 name: "normal";
654 name: "normal";
@@ -745,22 +748,22 @@ AbstractStage {
745 },
748 },
746 Transition {
749 Transition {
747 to: "spread"
750 to: "spread"
748− PropertyAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
751+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
749− PropertyAnimation { target: decoratedWindow; properties: "width,height,angle"; duration: priv.animationDuration }
752+ UbuntuNumberAnimation { target: decoratedWindow; properties: "width,height,angle,baseScale"; duration: priv.animationDuration }
750 },
753 },
751 Transition {
754 Transition {
752 from: "spread"; to: "staged,normal"
755 from: "spread"; to: "staged,normal"
753− PropertyAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
756+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
754− PropertyAnimation { target: decoratedWindow; properties: "angle,width,height"; duration: priv.animationDuration }
757+ UbuntuNumberAnimation { target: decoratedWindow; properties: "angle,width,height,baseScale"; duration: priv.animationDuration }
755 },
758 },
756 Transition {
759 Transition {
757 from: "normal"; to: "staged";
760 from: "normal"; to: "staged";
758− PropertyAnimation { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight"; duration: priv.animationDuration }
761+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y,requestedWidth,requestedHeight"; duration: priv.animationDuration }
759 },
762 },
760 Transition {
763 Transition {
761 to: "staged"
764 to: "staged"
762− PropertyAnimation { target: appDelegate; properties: "x,y"; duration: priv.animationDuration }
765+ UbuntuNumberAnimation { target: appDelegate; properties: "x,y"; duration: priv.animationDuration }
763− PropertyAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }
766+ UbuntuNumberAnimation { target: appDelegate; properties: "requestedWidth,requestedHeight"; duration: priv.animationDuration }
764 }
767 }
765
768
766 ]
769 ]
@@ -857,19 +860,29 @@ AbstractStage {
857 property real angle: 0
860 property real angle: 0
858 property real itemScale: 1
861 property real itemScale: 1
859 transform: [
862 transform: [
860−// Scale {
863+ Scale {
861−// origin.x: itemScaleOriginX
864+ origin.x: itemScaleOriginX
862−// origin.y: itemScaleOriginY
865+ origin.y: itemScaleOriginY
863−// xScale: itemScale
866+ xScale: decoratedWindow.itemScale
864−// yScale: itemScale
867+ yScale: decoratedWindow.itemScale
865−// },
868+ },
866 Rotation {
869 Rotation {
867− origin { x: 0; y: (decoratedWindow.height - (decoratedWindow.height * decoratedWindow.itemScale / 2)) }
870+ origin { x: 0; y: (decoratedWindow.height * decoratedWindow.itemScale / 2) }
868 axis { x: 0; y: 1; z: 0 }
871 axis { x: 0; y: 1; z: 0 }
869 angle: decoratedWindow.angle
872 angle: decoratedWindow.angle
870 }
873 }
871 ]
874 ]
872 }
875 }
876+ BorderImage {
877+ anchors {
878+ fill: decoratedWindow
879+ margins: /*active ? -units.gu(2) : */-units.gu(1.5)
880+ }
881+ source: "graphics/dropshadow2gu.sci"
882+ opacity: root.shadowOpacity * .3
883+ visible: false
884+ }
885+
873
886
874 WindowControlsOverlay {
887 WindowControlsOverlay {
875 id: touchControls
888 id: touchControls
@@ -902,7 +915,7 @@ AbstractStage {
902
915
903 WindowInfoItem {
916 WindowInfoItem {
904 id: windowInfoItem
917 id: windowInfoItem
905− anchors { left: parent.left; bottom: parent.bottom }
918+ anchors { left: parent.left; top: decoratedWindow.bottom; topMargin: units.gu(1) }
906 title: decoratedWindow.title
919 title: decoratedWindow.title
907 iconSource: model.application.icon
920 iconSource: model.application.icon
908 opacity: 0
921 opacity: 0
qml/Stages/SpreadMaths.qml+2
@@ -67,6 +67,8 @@ Item {
67 readonly property real middleSectionProgress: (linearX - margins - foldingAreaWidth) / (flickableWidth - (margins + foldingAreaWidth) * 2)
67 readonly property real middleSectionProgress: (linearX - margins - foldingAreaWidth) / (flickableWidth - (margins + foldingAreaWidth) * 2)
68
68
69 // Output
69 // Output
70+ readonly property int tileSize: units.gu(40)
71+
70 readonly property int animatedX: {
72 readonly property int animatedX: {
71 if (itemIndex == 0) print("leftFoldingAreaProgress", leftFoldingAreaProgress, "rightFoldingAreaProgress", rightFoldingAreaProgress)
73 if (itemIndex == 0) print("leftFoldingAreaProgress", leftFoldingAreaProgress, "rightFoldingAreaProgress", rightFoldingAreaProgress)
72 if (leftFoldingAreaProgress > 4) { // Stop it at the edge
74 if (leftFoldingAreaProgress > 4) { // Stop it at the edge
tests/qmltests/CMakeLists.txt+1
@@ -94,6 +94,7 @@ add_unity8_qmltest(Stages SurfaceContainer)
94add_unity8_qmltest(Stages TabletStage)
94add_unity8_qmltest(Stages TabletStage)
95add_unity8_qmltest(Stages WindowResizeArea)
95add_unity8_qmltest(Stages WindowResizeArea)
96add_unity8_qmltest(Stages Splash)
96add_unity8_qmltest(Stages Splash)
97+add_unity8_qmltest(Stages DecoratedWindow)
97add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
98add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
98add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
99add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
99add_unity8_qmltest(utils/Unity/Test UnityTest)
100add_unity8_qmltest(utils/Unity/Test UnityTest)