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

WIP: Hand-merge all the IDLs under Terminal.Settings.Model and Editor #16931

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

DHowett
Copy link
Member

@DHowett DHowett commented Mar 25, 2024

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 colorMoved enabled:

git diff --color-moved=dimmed-zebra --color-moved-ws=ignore-all-space (git merge-base origin/main origin/dev/duhowett/fhl-2024/merge-idls) origin/dev/duhowett/fhl-2024/merge-idls

…/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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant