git.iko.soy/unity8
on xenial help sign in
reduce some paint layers.
ba512d5Michael 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+8−3
@@ -18,11 +18,9 @@ import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19import GSettings 1.0
19import GSettings 1.0
20
20
21−Rectangle {
21+Item {
22 id: root
22 id: root
23
23
24− color: "#060606"
25−
26 // Controls to be set from outside
24 // Controls to be set from outside
27 property bool altTabPressed
25 property bool altTabPressed
28 property url background
26 property url background
@@ -42,6 +40,7 @@ Rectangle {
42 property bool suspended
40 property bool suspended
43 // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
41 // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
44 property int leftMargin: 0
42 property int leftMargin: 0
43+ property alias paintBackground: background.visible
45
44
46 // To be read from outside
45 // To be read from outside
47 property var mainApp: null
46 property var mainApp: null
@@ -70,4 +69,10 @@ Rectangle {
70 }
69 }
71 return false;
70 return false;
72 }
71 }
72+
73+ Rectangle {
74+ id: background
75+ anchors.fill: parent
76+ color: "#060606"
77+ }
73}
78}
qml/Stages/PhoneStage.qml+3
@@ -32,6 +32,8 @@ AbstractStage {
32 property real startScale: 1.1
32 property real startScale: 1.1
33 property real endScale: 0.7
33 property real endScale: 0.7
34
34
35+ paintBackground: spreadView.shiftedContentX !== 0
36+
35 onBeingResizedChanged: {
37 onBeingResizedChanged: {
36 if (beingResized) {
38 if (beingResized) {
37 // Brace yourselves for impact!
39 // Brace yourselves for impact!
@@ -324,6 +326,7 @@ AbstractStage {
324 }
326 }
325
327
326 onShiftedContentXChanged: {
328 onShiftedContentXChanged: {
329+print("shiftedContent", shiftedContentX, "content", contentX)
327 if (root.beingResized) {
330 if (root.beingResized) {
328 // Flickabe.contentX wiggles during resizes. Don't react to it.
331 // Flickabe.contentX wiggles during resizes. Don't react to it.
329 return;
332 return;
qml/Stages/TabletStage.qml+2
@@ -30,6 +30,8 @@ AbstractStage {
30 property alias sideStageVisible: spreadView.sideStageVisible
30 property alias sideStageVisible: spreadView.sideStageVisible
31 property alias sideStageWidth: spreadView.sideStageWidth
31 property alias sideStageWidth: spreadView.sideStageWidth
32
32
33+ paintBackground: spreadView.shiftedContentX !== 0
34+
33 // Functions to be called from outside
35 // Functions to be called from outside
34 function updateFocusedAppOrientation() {
36 function updateFocusedAppOrientation() {
35 var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
37 var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);