Skip to content

Fix layering of sc() keybindings with vk() ones#10917

Merged
4 commits merged intomainfrom
dev/lhecker/10875-fix-action-map-layering
Aug 11, 2021
Merged

Fix layering of sc() keybindings with vk() ones#10917
4 commits merged intomainfrom
dev/lhecker/10875-fix-action-map-layering

Conversation

@lhecker
Copy link
Member

@lhecker lhecker commented Aug 11, 2021 •
edited
Loading

The quake mode keybinding is bound to a scancode. This made it
impossible to override it with a vkey-based one like "win+`".
This commit fixes the issue by making sure that a KeyChord always has a vkey,
and leveraging this fact inside ActionMap, which now ignores the scan-code.

PR Checklist

Validation Steps Performed

@ghost ghost added Area-Settings Issues related to settings and customizability, for console or terminal Area-Windowing Window frame, quake mode, tearout Issue-Bug It either shouldn't be doing this or needs an investigation. Product-Terminal The new Windows Terminal. Severity-Blocking We won't ship a release like this! No-siree. labels Aug 11, 2021
@lhecker lhecker force-pushed the dev/lhecker/10875-fix-action-map-layering branch from 552e50b to fab527e Compare August 11, 2021 00:14
@github-actions

This comment has been minimized.

Sign in to view
@lhecker lhecker force-pushed the dev/lhecker/10875-fix-action-map-layering branch from fab527e to 6deaa87 Compare August 11, 2021 16:04
@lhecker lhecker marked this pull request as ready for review August 11, 2021 16:05
@lhecker
Copy link
Member Author

lhecker commented Aug 11, 2021 •
edited
Loading

I've rebased this PR to resolve merge conflicts with #10907, added a comment and removed redundant code from IslandWindow::RegisterHotKey.
The diff is a bit more compact now.

@DHowett
Copy link
Member

DHowett commented Aug 11, 2021

@msftbot merge this in 18 minutes

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Aug 11, 2021
@ghost
Copy link

ghost commented Aug 11, 2021

Hello @DHowett!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Wed, 11 Aug 2021 18:13:56 GMT, which is in 18 minutes

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@DHowett
Copy link
Member

DHowett commented Aug 11, 2021

(build's failing though so it will ignore me 😄)

@ghost ghost merged commit d465a47 into main Aug 11, 2021
@ghost ghost deleted the dev/lhecker/10875-fix-action-map-layering branch August 11, 2021 23:09
@ghost
Copy link

ghost commented Aug 31, 2021

🎉Windows Terminal Preview v1.11.2421.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost ghost mentioned this pull request Aug 31, 2021
Closed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DHowett DHowett DHowett approved these changes

@zadjii-msft zadjii-msft zadjii-msft approved these changes

Assignees

No one assigned

Labels

Area-Settings Issues related to settings and customizability, for console or terminal Area-Windowing Window frame, quake mode, tearout AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Product-Terminal The new Windows Terminal. Severity-Blocking We won't ship a release like this! No-siree.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[1.11 blocking] Overloading win+` doesn't work anymore

3 participants

@lhecker @DHowett @zadjii-msft