Use WinRT VirtualKeyModifiers instead of a custom enum by mimvdb · Pull Request #10603 · microsoft/terminal

mimvdb · 2021-07-09T23:02:16Z

Replaces KeyModifiers with the pretty much equivalent
VirtualKeyModifiers enum in winrt.

After doing this I noticed #10593 which changes the KeyChords a lot, but
it seems these PRs are still compatible

The issue also mentions replacing Vkey with
Windows::System::VirtualKey, but I chose not to because that enum only
includes a subset of the keys terminal supports here (no VK_OEM_* keys)

Validation Steps Performed

Changed key bind in config, and confirmed it still works after
restarting terminal

Closes #877

lhecker

This PR removes the need for ConvertVKModifiers. Nice. 👍
If you want to you could write

using VirtualKeyModifiers = winrt::Windows::System::VirtualKeyModifiers;

here and there, to shorten the code lines, but I'm fine with merging as it is.

DHowett · 2021-07-10T01:40:40Z

So, our initial design for the terminal settings model was intended to avoid a dependency on the Windows.UI namespace-- it is a big namespace that we may not want consumers to depend on.

@zadjii-msft and @carlos-zamora may have opinions.

DHowett · 2021-07-10T01:40:57Z

(At the same time, thanks for the contribution! It's good to have you here :))

lhecker · 2021-07-10T02:30:49Z

@DHowett Isn't VirtualKeyModifiers part of the Windows.System namespace?

mimvdb · 2021-07-10T08:14:17Z

Windows.UI is used in several places in the terminal settings model. For example, in ActionArgs Windows::UI::Color for TabColor. The Windows.System namespace does seem te be new, although winrt/Windows.System.h is included in the pch.

DHowett · 2021-07-12T16:08:33Z

Windows.UI is used in several places in the terminal settings model. For example, in ActionArgs Windows::UI::Color for TabColor. The Windows.System namespace does seem te be new, although winrt/Windows.System.h is included in the pch.

@DHowett Dustin Howett FTE Isn't VirtualKeyModifiers part of the Windows.System namespace?

Shows what I get for triaging pull requests on my phone and not reading their bodies. Thanks all! This looks fine to me, but I'd prefer @zadjii-msft sign off.

@msftbot make sure @zadjii-msft signs off

DHowett · 2021-07-12T16:08:50Z

@msftbot make sure @zadjii-msft signs off

ghost · 2021-07-12T16:09:32Z

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'll only merge this pull request if it's approved by @zadjii-msft

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".

carlos-zamora

Just a minor suggestion.

I'll probably run into a few conflicts on my end with adding a key chord listener to the actions page in SUI, but that's my problem, not yours haha.

src/cascadia/TerminalApp/TerminalPage.cpp

Co-authored-by: Carlos Zamora <[email protected]>

ghost · 2021-07-12T21:20:45Z

Hello @DHowett!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

ghost · 2021-07-14T17:04:17Z

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

Handy links:

Use WinRT VirtualKeyModifiers instead of a custom enum

d2c571b

ghost added Area-CodeHealth Issues related to code cleanliness, linting, rules, warnings, errors, static analysis, etc. Issue-Task It's a feature request, but it doesn't really need a major design. Product-Terminal The new Windows Terminal. labels Jul 9, 2021

lhecker approved these changes Jul 10, 2021

View reviewed changes

mimvdb added 2 commits July 10, 2021 11:10

Clean up long namespace references to VirtualKeyModifiers

0f0fca7

Fix colon typo

992bf1b

ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jul 12, 2021

carlos-zamora approved these changes Jul 12, 2021

View reviewed changes

src/cascadia/TerminalApp/TerminalPage.cpp Outdated Show resolved Hide resolved

Remove redundant variable

59942c5

Co-authored-by: Carlos Zamora <[email protected]>

ghost removed the AutoMerge Marked for automatic merge by the bot when requirements are met label Jul 12, 2021

DHowett approved these changes Jul 12, 2021

View reviewed changes

DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jul 12, 2021

zadjii-msft approved these changes Jul 12, 2021

View reviewed changes

ghost merged commit 17e68a0 into microsoft:main Jul 12, 2021

ghost mentioned this pull request Jul 14, 2021

KeyChord should just use the existing WinRT types instead of defining our own #877

Closed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use WinRT VirtualKeyModifiers instead of a custom enum#10603

Use WinRT VirtualKeyModifiers instead of a custom enum#10603
4 commits merged intomicrosoft:mainfrom
mimvdb:dev/mimvdb/winrt_keychord

mimvdb commented Jul 9, 2021 •

edited by DHowett

Loading

Uh oh!

lhecker left a comment

Uh oh!

DHowett commented Jul 10, 2021

Uh oh!

DHowett commented Jul 10, 2021

Uh oh!

lhecker commented Jul 10, 2021

Uh oh!

mimvdb commented Jul 10, 2021

Uh oh!

DHowett commented Jul 12, 2021

Uh oh!

DHowett commented Jul 12, 2021

Uh oh!

ghost commented Jul 12, 2021

Uh oh!

carlos-zamora left a comment

Uh oh!

Uh oh!

ghost commented Jul 12, 2021

Uh oh!

ghost commented Jul 14, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

mimvdb commented Jul 9, 2021 • edited by DHowett Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Validation Steps Performed

Uh oh!

lhecker left a comment

Choose a reason for hiding this comment

Uh oh!

DHowett commented Jul 10, 2021

Uh oh!

DHowett commented Jul 10, 2021

Uh oh!

lhecker commented Jul 10, 2021

Uh oh!

mimvdb commented Jul 10, 2021

Uh oh!

DHowett commented Jul 12, 2021

Uh oh!

DHowett commented Jul 12, 2021

Uh oh!

ghost commented Jul 12, 2021

Uh oh!

carlos-zamora left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ghost commented Jul 12, 2021

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

ghost commented Jul 14, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mimvdb commented Jul 9, 2021 •

edited by DHowett

Loading

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.