git.iko.soy/unity8
on xenial help sign in
fix resetting overlayOverride
bd7f59bMichael Zanetti
qml/Stages/StageWithSideStage.qml+6−1
compare with xenial
unifiedsplit
@@ -22,6 +22,8 @@ Item {
22
22
23 readonly property int overlayWidth: priv.overlayOverride ? 0 : priv.sideStageWidth
23 readonly property int overlayWidth: priv.overlayOverride ? 0 : priv.sideStageWidth
24
24
25+ onPaintingChanged: print(":::::::::::::::::::::::::::::::: painting changed:", painting, "overlayMode:", overlayMode)
26+ onOverlayModeChanged: print(";;;;;;;;;;;;;;;;;;;;;;;;;; overlayModeChanged:", overlayWidth)
25
27
26 onShownChanged: {
28 onShownChanged: {
27// print("shown", shown)
29// print("shown", shown)
@@ -330,6 +332,8 @@ Item {
330 property int targetX: root.width
332 property int targetX: root.width
331 property string snapToId
333 property string snapToId
332
334
335+ onRunningChanged: print("sideStageSnapAnimation running changed:", running, sideStageImage.visible, mainStageImage.visible, root.painting, mainStageImage.visible || sideStageImage.visible || sideStageSnapAnimation.running)
336+
333 UbuntuNumberAnimation { target: sideStageImage; property: "x"; to: sideStageSnapAnimation.targetX; duration: UbuntuAnimation.SlowDuration }
337 UbuntuNumberAnimation { target: sideStageImage; property: "x"; to: sideStageSnapAnimation.targetX; duration: UbuntuAnimation.SlowDuration }
334 ScriptAction {
338 ScriptAction {
335 script: {
339 script: {
@@ -349,10 +353,11 @@ Item {
349 ApplicationManager.focusApplication(sideStageSnapAnimation.snapToId)
353 ApplicationManager.focusApplication(sideStageSnapAnimation.snapToId)
350 sideStageSnapAnimation.snapToId = "";
354 sideStageSnapAnimation.snapToId = "";
351 sideStageImage.shown = true;
355 sideStageImage.shown = true;
356+ priv.overlayOverride = false;
352 }
357 }
353 sideStageImage.visible = false;
358 sideStageImage.visible = false;
354 mainStageImage.visible = false;
359 mainStageImage.visible = false;
355− print("snapped sidestage")
360+ print("snapped sidestage", root.overlayMode, root.painting)
356 }
361 }
357 }
362 }
358 }
363 }