on xenial help sign in
fix minimizing windows from panel
3f8fd1cLukáš Tinkl
qml/Stages/DesktopStage.qml+3−4
@@ -104,7 +104,7 @@ AbstractStage {
104 id: minimizeRestoreShortcut
104 id: minimizeRestoreShortcut
105 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
105 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
106 onTriggered: priv.focusedAppDelegate.maximized || priv.focusedAppDelegate.maximizedLeft || priv.focusedAppDelegate.maximizedRight
106 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()
108 active: priv.focusedAppDelegate !== null
108 active: priv.focusedAppDelegate !== null
109 }
109 }
110
110
@@ -302,7 +302,6 @@ AbstractStage {
302 }
302 }
303 function minimize(animated) {
303 function minimize(animated) {
304 animationsEnabled = (animated === undefined) || animated;
304 animationsEnabled = (animated === undefined) || animated;
305− maximized = false;
306 minimized = true;
305 minimized = true;
307 }
306 }
308 function restore(animated) {
307 function restore(animated) {
@@ -340,7 +339,7 @@ AbstractStage {
340 }
339 }
341 },
340 },
342 State {
341 State {
343− name: "maximized"; when: appDelegate.maximized
342+ name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
344 PropertyChanges {
343 PropertyChanges {
345 target: appDelegate;
344 target: appDelegate;
346 x: 0; y: 0;
345 x: 0; y: 0;
@@ -436,7 +435,7 @@ AbstractStage {
436 onClose: ApplicationManager.stopApplication(model.appId)
435 onClose: ApplicationManager.stopApplication(model.appId)
437 onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
436 onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
438 ? appDelegate.restore() : appDelegate.maximize()
437 ? appDelegate.restore() : appDelegate.maximize()
439− onMinimize: appDelegate.minimize(true)
438+ onMinimize: appDelegate.minimize()
440 onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
439 onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
441 }
440 }
442 }
441 }