Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken dock command

Browse source
This commit is contained in:
Mikayla Maki 2023-02-23 14:15:05 -08:00
parent 9004640586
commit 8860346324
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/keymaps/default.json
View file

@ -456,7 +456,7 @@
} }
}, },
{ {
"context": "Dock > Pane", "context": "Pane && docked",
"bindings": { "bindings": {
"shift-escape": "dock::HideDock", "shift-escape": "dock::HideDock",
"cmd-escape": "dock::RemoveTabFromDock" "cmd-escape": "dock::RemoveTabFromDock"

3
crates/gpui/src/keymap_matcher.rs
View file

@ -89,7 +89,6 @@ impl KeymapMatcher {
self.contexts self.contexts
.extend(dispatch_path.iter_mut().map(|e| std::mem::take(&mut e.1))); .extend(dispatch_path.iter_mut().map(|e| std::mem::take(&mut e.1)));
dbg!(&self.contexts);
// Find the bindings which map the pending keystrokes and current context // Find the bindings which map the pending keystrokes and current context
for (i, (view_id, _)) in dispatch_path.iter().enumerate() { for (i, (view_id, _)) in dispatch_path.iter().enumerate() {
// Don't require pending view entry if there are no pending keystrokes // Don't require pending view entry if there are no pending keystrokes
@ -121,8 +120,6 @@ impl KeymapMatcher {
} }
} }
dbg!(&matched_bindings);
if !any_pending { if !any_pending {
self.clear_pending(); self.clear_pending();
} }

4
crates/terminal_view/src/terminal_view.rs
View file

@ -483,9 +483,7 @@ impl View for TerminalView {
} }
if mode.contains(TermMode::APP_KEYPAD) { if mode.contains(TermMode::APP_KEYPAD) {
context.add_identifier("DECPAM"); context.add_identifier("DECPAM");
} } else {
//Note the ! here
if !mode.contains(TermMode::APP_KEYPAD) {
context.add_identifier("DECPNM"); context.add_identifier("DECPNM");
} }
if mode.contains(TermMode::SHOW_CURSOR) { if mode.contains(TermMode::SHOW_CURSOR) {