Skip to content

Commit 56dd281

Browse files
committed
keybindings.js: Allow keybindings during POPUP action mode.
This fixes super not closing the menu once it's open, a regression from 3eca438.
1 parent 6e00036 commit 56dd281

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

js/ui/keybindings.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ KeybindingManager.prototype = {
276276

277277
addHotKeyArray: function(name, bindings, callback,
278278
flags=Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
279-
allowedModes=Cinnamon.ActionMode.NORMAL) {
279+
allowedModes=Cinnamon.ActionMode.NORMAL |
280+
Cinnamon.ActionMode.POPUP) {
280281
let [existing_action_id, entry] = this._lookupEntry(name);
281282

282283
if (entry !== undefined) {

js/ui/windowManager.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,6 @@ var WindowManager = class WindowManager {
445445
return this._seenWindows.has(metaWindow);
446446
}
447447

448-
_filterKeybinding(shellwm, binding) {
449-
// TODO: We can use ActionModes to manage what keybindings are
450-
// available where. For now just disable this, things are handled
451-
// in Main._stageEventHandler.
452-
return false;
453-
}
454448

455449
onSettingsChanged(settings, key, data=null) {
456450
if (key === "desktop-effects-workspace") {

0 commit comments

Comments
 (0)