git.iko.soy/unity8
on xenial help sign in
disable shortcuts when not needed
babe387Michael Zanetti
qml/Stage/Stage.qml+5−4
compare with xenial
unifiedsplit
@@ -104,27 +104,28 @@ AbstractStage {
104 id: minimizeAllShortcut
104 id: minimizeAllShortcut
105 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_D
105 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_D
106 onTriggered: priv.minimizeAllWindows()
106 onTriggered: priv.minimizeAllWindows()
107+ active: root.state == "windowed"
107 }
108 }
108
109
109 GlobalShortcut {
110 GlobalShortcut {
110 id: maximizeWindowShortcut
111 id: maximizeWindowShortcut
111 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
112 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
112 onTriggered: priv.focusedAppDelegate.maximize()
113 onTriggered: priv.focusedAppDelegate.maximize()
113− active: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.canBeMaximized
114+ active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximized
114 }
115 }
115
116
116 GlobalShortcut {
117 GlobalShortcut {
117 id: maximizeWindowLeftShortcut
118 id: maximizeWindowLeftShortcut
118 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
119 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
119 onTriggered: priv.focusedAppDelegate.maximizeLeft()
120 onTriggered: priv.focusedAppDelegate.maximizeLeft()
120− active: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.canBeMaximizedLeftRight
121+ active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
121 }
122 }
122
123
123 GlobalShortcut {
124 GlobalShortcut {
124 id: maximizeWindowRightShortcut
125 id: maximizeWindowRightShortcut
125 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
126 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
126 onTriggered: priv.focusedAppDelegate.maximizeRight()
127 onTriggered: priv.focusedAppDelegate.maximizeRight()
127− active: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.canBeMaximizedLeftRight
128+ active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
128 }
129 }
129
130
130 GlobalShortcut {
131 GlobalShortcut {
@@ -132,7 +133,7 @@ AbstractStage {
132 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
133 shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
133 onTriggered: priv.focusedAppDelegate.anyMaximized
134 onTriggered: priv.focusedAppDelegate.anyMaximized
134 ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
135 ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
135− active: priv.focusedAppDelegate !== null
136+ active: root.state == "windowed" && priv.focusedAppDelegate
136 }
137 }
137
138
138 GlobalShortcut {
139 GlobalShortcut {