git.iko.soy/unity8
on xenial help sign in
fix some warnings
commit2a70f1058ee4612e30ba3bb994cd6c1b08ee5dea authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 5 Aug 2016, 18:10 (10 years ago) parentc7f3af1
3 files changed+7−3
compare with xenial
unifiedsplit
qml/Stage/Spread/Spread.qml+2−1 qml/Stage/Spread/StagedRightEdgeMaths.qml+3 qml/Stage/Stage.qml+2−2
qml/Stage/Spread/Spread.qml+2−1
@@ -91,7 +91,8 @@ Item {
9191 y: windowTitleTopMargin
9292// //y: priv.spreadTopMargin + priv.contentTopMargin + settings.spreadOffset + settings.titleOffset - height - (priv.contentTopMargin - height) / 4
9393// visible: height < priv.contentTopMargin
94− text: root.highlightedIndex >= 0 && root.model ? root.model.surfaceAt(root.highlightedIndex).name : ""
94+ property var highlightedSurface: root.model ? root.model.surfaceAt(root.highlightedIndex) : null
95+ text: root.highlightedIndex >= 0 && highlightedSurface ? highlightedSurface.name : ""
9596 fontSize: root.height < units.gu(85) ? 'medium' : 'large'
9697 color: "white"
9798 opacity: root.highlightedIndex >= 0 ? 1 : 0
qml/Stage/Spread/StagedRightEdgeMaths.qml+3
@@ -48,6 +48,9 @@ QtObject {
4848
4949 readonly property int animatedX: {
5050 var stageCount = (priv.mainStageDelegate ? 1 : 0) + (priv.sideStageDelegate ? 1 : 0)
51+
52+ if (appRepeater.count <= nextInStack) return 0;
53+
5154 var nextStage = appRepeater.itemAt(nextInStack).stage;
5255
5356 var startX = 0;
qml/Stage/Stage.qml+2−2
@@ -558,7 +558,7 @@ AbstractStage {
558558 readonly property bool maximizedHorizontally: windowState & WindowStateStorage.WindowStateMaximizedHorizontally
559559 readonly property bool maximizedVertically: windowState & WindowStateStorage.WindowStateMaximizedVertically
560560 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;
562562
563563 property int windowState: WindowStateStorage.WindowStateNormal
564564 property bool animationsEnabled: true
@@ -805,7 +805,7 @@ AbstractStage {
805805 itemIndex: index
806806 nextInStack: priv.nextInStack
807807 progress: 0
808− targetHeight: spreadMaths.stackHeight
808+ targetHeight: spreadItem.stackHeight
809809 targetX: spreadMaths.targetX
810810 startY: appDelegate.fullscreen ? 0 : PanelState.panelHeight
811811 targetY: spreadMaths.targetY