Make Terminal look great in High Contrast #6833

jtippet · 2020-07-08T16:30:43Z

Summary of the Pull Request

This PR enables ApplicationHighContrastAdjustment::None. Doing this disables a set of mitigations in XAML designed to band-aid apps that were never explicitly designed for High Contrast (HC) modes. Terminal now has full control of and responsibility for its appearance in HC mode. This allows Terminal to look a lot better.

PR Checklist

Closes UI is broken in system high contrast mode #5360
CLA signed. If not, go over here and sign the CLA
Tests added/passed
Documentation updated. If checked, please file a pull request on our docs repo and link it here: #xxx
Schema updated.
I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

On paper, we should be able to set HighContrastAdjustment="None" on the <Application> element. But that doesn't have any effect. I don't know if this is a bug in <Toolkit:XamlApplication> or somewhere else. So instead I set the property in codebehind, which is not as ideal, but does at least work. I'd love to a way to move this into App.xaml.

The Find box had a couple stray styles to override the ToggleButton's foreground color. With backplating removed, these styles became actively harmful (white foreground on highlight color background), so I just removed them. The built-in style for ToggleButton is perfect as-is.

Validation Steps Performed

Vicariously validate via viewing various vivid videos.

High Contrast White:

High Contrast Dark:

The previous appearance, prior to this PR, for comparison purposes:

@mimi89999 this is the PR you've been waiting for ;) Thanks for reporting the HC bugs, and please do keep leaning on apps to make them look great in HC mode.

mimi89999 · 2020-07-08T16:55:47Z

Thanks a lot for your work on this. I'm waiting for this to land in master for the pipeline not being a PR one to test the artifacts 😄

zadjii-msft

Thanks for doing this!

src/cascadia/TerminalApp/App.cpp

DHowett

In general, I am neither surprised nor horrified to learn that there is a global magic flag that is set to "do weird stuff to my application" mode by default.

Thank you for doing this. We really needed it.

jtippet · 2020-07-08T18:53:57Z

In general, I am neither surprised nor horrified to learn that there is a global magic flag that is set to "do weird stuff to my application" mode by default.

Console defaults to CP_OEM streams or something equally vile ��

DHowett · 2020-07-08T18:54:49Z

I feel very seen right now
😁

DHowett · 2020-07-08T18:57:12Z

@msftbot merge this in 5 minutes

ghost · 2020-07-08T18:57:15Z

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 won't merge this pull request until after the UTC date Wed, 08 Jul 2020 19:02:14 GMT, which is in 5 minutes

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

ghost · 2020-07-08T18:58:05Z

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.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 8 hours, a condition that will be fulfilled in about 4 minutes. No worries though, I will be back when the time is right! 😉

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.

## Summary of the Pull Request Update the Palette to be readable under High Contrast mode  ## References Regressed in #6833  ## PR Checklist * [X] Closes #6892 * [X] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx * [ ] Schema updated. * [X] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #6892  ## Detailed Description of the Pull Request / Additional comments I pulled the styling of the KeyChord text into a Style, so we can give it a different style under High Contrast. Under HC, I just left all the colors at their default, so ListView can do its thing. (IMHO, the HC style now looks better than the non-HC mode, but maybe I'm biased ;) )  ## Validation Steps Performed | | Old | New | |---|:---:|:---:| | Light | ![light](https://user-images.githubusercontent.com/10259764/87398203-6b8f9a80-c56a-11ea-99d0-2eeefcfea269.png) | ![newlight](https://user-images.githubusercontent.com/10259764/87399212-e3aa9000-c56b-11ea-9e94-c8fae8825cd1.png) | | Dark | ![dark](https://user-images.githubusercontent.com/10259764/87398269-819d5b00-c56a-11ea-9180-5c6ec1071b95.png) | ![newdark](https://user-images.githubusercontent.com/10259764/87399227-ead19e00-c56b-11ea-996d-ad52bc2dcbf3.png) | | HC White | ![oldwhite](https://user-images.githubusercontent.com/10259764/87398320-92e66780-c56a-11ea-9d52-e2f6e31ae487.png) | ![newwhite](https://user-images.githubusercontent.com/10259764/87398340-98dc4880-c56a-11ea-87e2-ed257ad89c4a.png) | | HC Black | ![oldblack](https://user-images.githubusercontent.com/10259764/87398357-9f6ac000-c56a-11ea-848c-1ccef6a65442.png) | ![newblack](https://user-images.githubusercontent.com/10259764/87398370-a396dd80-c56a-11ea-9540-8aa9bb934791.png) |

ghost · 2020-07-22T16:22:11Z

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

Handy links:

Enable ApplicationHighContrastAdjustment::None

3f66d08

ghost added Area-UserInterface Issues pertaining to the user interface of the Console or Terminal Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-3 A description (P3) Product-Terminal The new Windows Terminal. labels Jul 8, 2020

zadjii-msft approved these changes Jul 8, 2020

View reviewed changes

miniksa reviewed Jul 8, 2020

View reviewed changes

src/cascadia/TerminalApp/App.cpp Show resolved Hide resolved

Review

dae703a

DHowett approved these changes Jul 8, 2020

View reviewed changes

Spelling

1196292

miniksa approved these changes Jul 8, 2020

View reviewed changes

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

DHowett added AutoMerge Marked for automatic merge by the bot when requirements are met and removed AutoMerge Marked for automatic merge by the bot when requirements are met labels Jul 8, 2020

DHowett removed the AutoMerge Marked for automatic merge by the bot when requirements are met label Jul 8, 2020

DHowett merged commit 182a3bb into microsoft:master Jul 8, 2020

zadjii-msft mentioned this pull request Jul 13, 2020

Command Palette key bindings are unreadable in High Contrast mode #6892

Closed

jtippet mentioned this pull request Jul 14, 2020

Tweak the Palette's KeyChord for High Contrast mode #6910

Merged

6 tasks

ghost mentioned this pull request Jul 22, 2020

UI is broken in system high contrast mode #5360

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make Terminal look great in High Contrast #6833

Make Terminal look great in High Contrast #6833

jtippet commented Jul 8, 2020 •

edited by DHowett

Loading

mimi89999 commented Jul 8, 2020

zadjii-msft left a comment

DHowett left a comment

jtippet commented Jul 8, 2020

DHowett commented Jul 8, 2020

DHowett commented Jul 8, 2020

ghost commented Jul 8, 2020

ghost commented Jul 8, 2020

ghost commented Jul 22, 2020

Make Terminal look great in High Contrast #6833

Make Terminal look great in High Contrast #6833

Conversation

jtippet commented Jul 8, 2020 • edited by DHowett Loading

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

mimi89999 commented Jul 8, 2020

zadjii-msft left a comment

Choose a reason for hiding this comment

DHowett left a comment

Choose a reason for hiding this comment

jtippet commented Jul 8, 2020

DHowett commented Jul 8, 2020

DHowett commented Jul 8, 2020

ghost commented Jul 8, 2020

ghost commented Jul 8, 2020

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 commented Jul 22, 2020

jtippet commented Jul 8, 2020 •

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.