WIP: Hand-merge all the IDLs under Terminal.Settings.Model and Editor #16931
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
…/merge-idls # Conflicts: # src/cascadia/TerminalSettingsEditor/Appearances.idl # src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl # src/cascadia/TerminalSettingsEditor/Profiles_Appearance.idl # src/cascadia/TerminalSettingsModel/ApplicationState.idl # src/cascadia/TerminalSettingsModel/Command.idl # src/cascadia/TerminalSettingsModel/FontConfig.idl
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.
This may be much more ergonomic to edit, and is definitely a lot more ergonomic to compile. This is how components have worked in Windows for the longest time.
I took the liberty of removing some
[default_interface]attributes where they were completely unnecessary (and were resulting in duplicate empty interfaces!) and fixing up EnumEntry to be a proper WinRT statics interface rather than a fake one.Note
This is easier to review with
colorMovedenabled: