git.iko.soy/unity8
on xenial help sign in
reduce some paint layers.
c1a1961Michael Zanetti
qml/OrientedShell.qml+1−2
compare with xenial
unifiedsplit
@@ -26,9 +26,8 @@ import "Rotation"
26// Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
26// Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
27import Ubuntu.Components 1.3
27import Ubuntu.Components 1.3
28
28
29−Rectangle {
29+Item {
30 id: root
30 id: root
31− color: "black"
32
31
33 implicitWidth: units.gu(40)
32 implicitWidth: units.gu(40)
34 implicitHeight: units.gu(71)
33 implicitHeight: units.gu(71)
qml/Stages/AbstractStage.qml+7−7
@@ -21,13 +21,6 @@ import GSettings 1.0
21FocusScope {
21FocusScope {
22 id: root
22 id: root
23
23
24− property alias color: backRect.color
25− Rectangle {
26− id: backRect
27− color: "#060606"
28− anchors.fill: parent
29− }
30−
31 // Controls to be set from outside
24 // Controls to be set from outside
32 property QtObject applicationManager
25 property QtObject applicationManager
33 property QtObject topLevelSurfaceList
26 property QtObject topLevelSurfaceList
@@ -49,6 +42,7 @@ FocusScope {
49 property bool suspended
42 property bool suspended
50 // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
43 // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
51 property int leftMargin: 0
44 property int leftMargin: 0
45+ property alias paintBackground: background.visible
52
46
53 // To be read from outside
47 // To be read from outside
54 property var mainApp: null
48 property var mainApp: null
@@ -77,4 +71,10 @@ FocusScope {
77 }
71 }
78 return false;
72 return false;
79 }
73 }
74+
75+ Rectangle {
76+ id: background
77+ color: "#060606"
78+ anchors.fill: parent
79+ }
80}
80}
qml/Stages/DesktopStage.qml+1
@@ -26,6 +26,7 @@ import GlobalShortcut 1.0
26AbstractStage {
26AbstractStage {
27 id: root
27 id: root
28 anchors.fill: parent
28 anchors.fill: parent
29+ paintBackground: false
29
30
30 // functions to be called from outside
31 // functions to be called from outside
31 function updateFocusedAppOrientation() { /* TODO */ }
32 function updateFocusedAppOrientation() { /* TODO */ }
qml/Stages/PhoneStage.qml+2
@@ -31,6 +31,8 @@ AbstractStage {
31 property real startScale: 1.1
31 property real startScale: 1.1
32 property real endScale: 0.7
32 property real endScale: 0.7
33
33
34+ paintBackground: spreadView.shiftedContentX !== 0
35+
34 onBeingResizedChanged: {
36 onBeingResizedChanged: {
35 if (beingResized) {
37 if (beingResized) {
36 // Brace yourselves for impact!
38 // Brace yourselves for impact!
qml/Stages/ShimStage.qml−1
@@ -21,7 +21,6 @@ AbstractStage {
21 id: shimStage
21 id: shimStage
22
22
23 anchors.fill: parent
23 anchors.fill: parent
24− color: UbuntuColors.lightAubergine
25
24
26 Text {
25 Text {
27 id: greeterModeText
26 id: greeterModeText
qml/Stages/TabletStage.qml+3
@@ -34,6 +34,8 @@ AbstractStage {
34 property int stageFocusedSurface: priv.focusedAppDelegate ? priv.focusedAppDelegate.stage : ApplicationInfoInterface.MainStage
34 property int stageFocusedSurface: priv.focusedAppDelegate ? priv.focusedAppDelegate.stage : ApplicationInfoInterface.MainStage
35 // </tutorial-hacks>
35 // </tutorial-hacks>
36
36
37+ paintBackground: spreadView.shiftedContentX !== 0
38+
37 // Functions to be called from outside
39 // Functions to be called from outside
38 function updateFocusedAppOrientation() {
40 function updateFocusedAppOrientation() {
39 var mainStageIndex = root.topLevelSurfaceList.indexForId(priv.mainStageItemId);
41 var mainStageIndex = root.topLevelSurfaceList.indexForId(priv.mainStageItemId);
@@ -746,6 +748,7 @@ AbstractStage {
746 surface: model.surface
748 surface: model.surface
747 closeable: !isDash
749 closeable: !isDash
748 highlightShown: root.altTabPressed && priv.highlightIndex == zIndex
750 highlightShown: root.altTabPressed && priv.highlightIndex == zIndex
751+ dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
749
752
750 readonly property bool wantsMainStage: stage == ApplicationInfoInterface.MainStage
753 readonly property bool wantsMainStage: stage == ApplicationInfoInterface.MainStage
751
754