git.iko.soy/unity8
on xenial help sign in
fix some warnings
2a70f10Michael Zanetti
qml/Stage/Spread/Spread.qml+2−1
compare with xenial
unifiedsplit
@@ -91,7 +91,8 @@ Item {
91 y: windowTitleTopMargin
91 y: windowTitleTopMargin
92// //y: priv.spreadTopMargin + priv.contentTopMargin + settings.spreadOffset + settings.titleOffset - height - (priv.contentTopMargin - height) / 4
92// //y: priv.spreadTopMargin + priv.contentTopMargin + settings.spreadOffset + settings.titleOffset - height - (priv.contentTopMargin - height) / 4
93// visible: height < priv.contentTopMargin
93// visible: height < priv.contentTopMargin
94+ property var highlightedSurface: root.model ? root.model.surfaceAt(root.highlightedIndex) : null
94− text: root.highlightedIndex >= 0 && root.model ? root.model.surfaceAt(root.highlightedIndex).name : ""
95+ text: root.highlightedIndex >= 0 && highlightedSurface ? highlightedSurface.name : ""
95 fontSize: root.height < units.gu(85) ? 'medium' : 'large'
96 fontSize: root.height < units.gu(85) ? 'medium' : 'large'
96 color: "white"
97 color: "white"
97 opacity: root.highlightedIndex >= 0 ? 1 : 0
98 opacity: root.highlightedIndex >= 0 ? 1 : 0
qml/Stage/Spread/StagedRightEdgeMaths.qml+3
@@ -48,6 +48,9 @@ QtObject {
48
48
49 readonly property int animatedX: {
49 readonly property int animatedX: {
50 var stageCount = (priv.mainStageDelegate ? 1 : 0) + (priv.sideStageDelegate ? 1 : 0)
50 var stageCount = (priv.mainStageDelegate ? 1 : 0) + (priv.sideStageDelegate ? 1 : 0)
51+
52+ if (appRepeater.count <= nextInStack) return 0;
53+
51 var nextStage = appRepeater.itemAt(nextInStack).stage;
54 var nextStage = appRepeater.itemAt(nextInStack).stage;
52
55
53 var startX = 0;
56 var startX = 0;
qml/Stage/Stage.qml+2−2
@@ -558,7 +558,7 @@ AbstractStage {
558 readonly property bool maximizedHorizontally: windowState & WindowStateStorage.WindowStateMaximizedHorizontally
558 readonly property bool maximizedHorizontally: windowState & WindowStateStorage.WindowStateMaximizedHorizontally
559 readonly property bool maximizedVertically: windowState & WindowStateStorage.WindowStateMaximizedVertically
559 readonly property bool maximizedVertically: windowState & WindowStateStorage.WindowStateMaximizedVertically
560 readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
560 readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
561− readonly property bool fullscreen: surface.state === Mir.FullscreenState;
561+ readonly property bool fullscreen: surface && surface.state === Mir.FullscreenState;
562
562
563 property int windowState: WindowStateStorage.WindowStateNormal
563 property int windowState: WindowStateStorage.WindowStateNormal
564 property bool animationsEnabled: true
564 property bool animationsEnabled: true
@@ -805,7 +805,7 @@ AbstractStage {
805 itemIndex: index
805 itemIndex: index
806 nextInStack: priv.nextInStack
806 nextInStack: priv.nextInStack
807 progress: 0
807 progress: 0
808− targetHeight: spreadMaths.stackHeight
808+ targetHeight: spreadItem.stackHeight
809 targetX: spreadMaths.targetX
809 targetX: spreadMaths.targetX
810 startY: appDelegate.fullscreen ? 0 : PanelState.panelHeight
810 startY: appDelegate.fullscreen ? 0 : PanelState.panelHeight
811 targetY: spreadMaths.targetY
811 targetY: spreadMaths.targetY