wpf: fix the TerminalTheme struct to marshal the same on all platforms #10486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The CursorStyle enum is declared as being of type `uint` on the C# side, but as `size_t` on the C++ side. There's a C# size_t impostor we could use, System.UIntPtr, but I don't want to risk changing the public API of TerminalTheme and I don't know if it can be used as a base type for an enum value. Anyway, since we don't have more than four billion cursor types I chose to narrow the field to a uint32_t and unpack it in TerminalSetTheme. Fixes #10485
ghost
added
the
Area-WPFControl
DHowett
changed the title
javierdlg
approved these changes
Jun 22, 2021
ghost
requested review from
|
@msftbot merge this in 3 minutes |
ghost
added
the
AutoMerge
|
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:
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
approved these changes
Jun 22, 2021
DHowett
added a commit
that referenced
this pull request
Jul 7, 2021
#10486) The CursorStyle enum is declared as being of type `uint` on the C# side, but as `size_t` on the C++ side. There's a C# size_t impostor we could use, System.UIntPtr, but I don't want to risk changing the public API of TerminalTheme and I don't know if it can be used as a base type for an enum. Anyway, since we don't have more than four billion cursor types I chose to narrow the field to a uint32_t and unpack it in TerminalSetTheme. Fixes #10485 (cherry picked from commit 2770228)
DHowett
added a commit
that referenced
this pull request
Jul 7, 2021
#10486) The CursorStyle enum is declared as being of type `uint` on the C# side, but as `size_t` on the C++ side. There's a C# size_t impostor we could use, System.UIntPtr, but I don't want to risk changing the public API of TerminalTheme and I don't know if it can be used as a base type for an enum. Anyway, since we don't have more than four billion cursor types I chose to narrow the field to a uint32_t and unpack it in TerminalSetTheme. Fixes #10485 (cherry picked from commit 2770228)
|
🎉 Handy links: |
ghost
mentioned this pull request
|
🎉 Handy links: |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The CursorStyle enum is declared as being of type
uinton the C# side,but as
size_ton the C++ side. There's a C# size_t impostor we coulduse, System.UIntPtr, but I don't want to risk changing the public API of
TerminalTheme and I don't know if it can be used as a base type for an
enum.
Anyway, since we don't have more than four billion cursor types I chose
to narrow the field to a uint32_t and unpack it in TerminalSetTheme.
Fixes #10485