Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display Unicode character for keys in HotkeySettingsControl #2249

Merged
merged 3 commits into from
Apr 21, 2020

Conversation

traies
Copy link
Member

@traies traies commented Apr 20, 2020

Summary of the Pull Request

The LayoutMap class from KeyboardManagerCommon was moved to common in order to reuse it in HotkeySettingsControl. In order to call the c++ code from C#, the interop project was created, which serves as a C++/CLI wrapper around the native code.

References

PR Checklist

Detailed Description of the Pull Request / Additional comments

  • There is also the limitation that projects compiled with the \clr flag cannot use the \MT setting.
  • This means the C++/CLI wrapper has to use the \MD setting, and this also applies to the common library it wraps around.
  • To prevent from changing the \MT flag in common, a common-md-flag project was set up that references the same files as common: keyboard_layout.h, keyboard_layout_impl.h and keyboard_layout.cpp

Validation Steps Performed

Manually tested Keyboard Manager works properly, and HotkeySettingsControls as well.

@traies traies force-pushed the dev/traies/UnicodeInHotkeySettings branch from fec7713 to 4955261 Compare April 20, 2020 20:21
@traies traies marked this pull request as ready for review April 20, 2020 20:29
@traies traies requested a review from a team April 20, 2020 20:30
@traies traies force-pushed the dev/traies/UnicodeInHotkeySettings branch from 4955261 to 3dc7d47 Compare April 20, 2020 21:15
@traies traies requested a review from arjunbalgovind April 20, 2020 21:22
@traies traies force-pushed the dev/traies/UnicodeInHotkeySettings branch 2 times, most recently from f91c9f5 to 420a874 Compare April 20, 2020 21:47
src/common/keyboard_layout.cpp Show resolved Hide resolved
src/common/keyboard_layout.cpp Outdated Show resolved Hide resolved
src/common/interop/AssemblyInfo.cpp Outdated Show resolved Hide resolved
src/common/keyboard_layout.h Show resolved Hide resolved
* A new interop project was setup to provide wrappers for C# projects
  that want to access functionality in the common project.
@traies traies force-pushed the dev/traies/UnicodeInHotkeySettings branch from 420a874 to 92db590 Compare April 20, 2020 22:51
@traies traies requested a review from arjunbalgovind April 21, 2020 01:06
Copy link
Contributor

@arjunbalgovind arjunbalgovind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I think the Win32 configs are still there in the common-md project, so we should remove that before merging.

@traies traies force-pushed the dev/traies/UnicodeInHotkeySettings branch from 337ab59 to e9c062c Compare April 21, 2020 03:56
@traies traies merged commit 93752fb into dev/build-features Apr 21, 2020
@traies traies deleted the dev/traies/UnicodeInHotkeySettings branch April 21, 2020 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants