on xenial help sign in
fix minimizing windows from panel
commit3f8fd1c9c165901c491aa22125fbc37156a9bfc5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 6 Nov 2015, 20:55 (11 years ago) parent05774cd
1 file changed+3−4
qml/Stages/DesktopStage.qml+3−4
qml/Stages/DesktopStage.qml+3−4
@@ -104,7 +104,7 @@ AbstractStage {
104104 id: minimizeRestoreShortcut
105105 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
106106 onTriggered: priv.focusedAppDelegate.maximized || priv.focusedAppDelegate.maximizedLeft || priv.focusedAppDelegate.maximizedRight
107− ? priv.focusedAppDelegate.restore() : priv.focusedAppDelegate.minimize(true)
107+ ? priv.focusedAppDelegate.restore() : priv.focusedAppDelegate.minimize()
108108 active: priv.focusedAppDelegate !== null
109109 }
110110
@@ -302,7 +302,6 @@ AbstractStage {
302302 }
303303 function minimize(animated) {
304304 animationsEnabled = (animated === undefined) || animated;
305− maximized = false;
306305 minimized = true;
307306 }
308307 function restore(animated) {
@@ -340,7 +339,7 @@ AbstractStage {
340339 }
341340 },
342341 State {
343− name: "maximized"; when: appDelegate.maximized
342+ name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
344343 PropertyChanges {
345344 target: appDelegate;
346345 x: 0; y: 0;
@@ -436,7 +435,7 @@ AbstractStage {
436435 onClose: ApplicationManager.stopApplication(model.appId)
437436 onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
438437 ? appDelegate.restore() : appDelegate.maximize()
439− onMinimize: appDelegate.minimize(true)
438+ onMinimize: appDelegate.minimize()
440439 onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
441440 }
442441 }