git.iko.soy/unity8
on xenial help sign in
merge lp:~dandrader/unity8/fix-shell-chrome

saves one appDelegate property

commit7731f38bf7d9bb6a18fd166164c257c88e0536d7 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 24 Feb 2017, 14:43 (10 years ago) parent9c65c63416b894
2 files changed+9−6
compare with xenial
unifiedsplit
qml/Stage/Stage.qml+6−5 qml/Stage/WindowStateSaver.qml+3−1
qml/Stage/Stage.qml+6−5
@@ -947,16 +947,17 @@ FocusScope {
947947 }
948948
949949 readonly property bool windowReady: clientAreaItem.surfaceInitialized
950− property int requestedWindowState: Mir.RestoredState
951950 onWindowReadyChanged: {
952951 if (windowReady) {
952+ var loadedMirState = WindowStateStorage.toMirState(windowStateSaver.loadedState);
953953 // need to apply the shell chrome policy on top the saved window state
954+ var policy;
954955 if (root.mode == "windowed") {
955− requestedWindowState = windowedFullscreenPolicy.applyPolicy(requestedWindowState, surface.shellChrome);
956+ policy = windowedFullscreenPolicy;
956957 } else {
957− requestedWindowState = stagedFullscreenPolicy.applyPolicy(requestedWindowState, surface.shellChrome);
958+ policy = stagedFullscreenPolicy
958959 }
959− window.requestState(requestedWindowState);
960+ window.requestState(policy.applyPolicy(loadedMirState, surface.shellChrome));
960961 }
961962 }
962963
@@ -971,7 +972,7 @@ FocusScope {
971972 windowedX = priv.focusedAppDelegate ? priv.focusedAppDelegate.windowedX + units.gu(3) : (normalZ - 1) * units.gu(3)
972973 windowedY = priv.focusedAppDelegate ? priv.focusedAppDelegate.windowedY + units.gu(3) : normalZ * units.gu(3)
973974 // Now load any saved state. This needs to happen *after* the cascading!
974− requestedWindowState = WindowStateStorage.toMirState(windowStateSaver.load());
975+ windowStateSaver.load();
975976
976977 updateQmlFocusFromMirSurfaceFocus();
977978
qml/Stage/WindowStateSaver.qml+3−1
@@ -28,6 +28,8 @@ QtObject {
2828 property int leftMargin: 0
2929 property int minimumY: 0
3030
31+ property int loadedState
32+
3133 function load() {
3234 var defaultWidth = units.gu(60);
3335 var defaultHeight = units.gu(50);
@@ -47,7 +49,7 @@ QtObject {
4749 target.restoredX = target.normalX;
4850 target.restoredY = target.normalY;
4951
50− return WindowStateStorage.getState(target.appId, WindowStateStorage.WindowStateNormal);
52+ loadedState = WindowStateStorage.getState(target.appId, WindowStateStorage.WindowStateNormal);
5153 }
5254
5355 function save() {