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

Rework dark theme TextBox and RichEditBox #2046

Merged
merged 4 commits into from
Mar 23, 2020

Conversation

marcelwgn
Copy link
Collaborator

@marcelwgn marcelwgn commented Feb 29, 2020

Description

This PR switches the light mode upon focus to dark mode for a dark themed TextBox, RichEditBox and AutoSuggestBox.

Motivation and Context

Closes #142

How Has This Been Tested?

Tested manually using MUXControlsTestApp

Screenshots (if appropriate):

Dark theme
darkmode-textbox

High contrast black
darkmode-textbox-highcontrast-black

High contrast #1
darkmode-textbox-highcontrast-1

High contrast #2
darkmode-textbox-highcontrast-2

@msft-github-bot msft-github-bot added the needs-triage Issue needs to be triaged by the area owners label Feb 29, 2020
@marcelwgn marcelwgn changed the title Darkmode textbox Rework dark theme TextBox and RichEditBox Feb 29, 2020
@ranjeshj
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@StephenLPeters
Copy link
Contributor

@chingucoding could you pull master into this branch? I think the pipeline failure fix got merged in after this changed.

@marcelwgn
Copy link
Collaborator Author

@StephenLPeters Done

@StephenLPeters StephenLPeters added area-Styling team-Controls Issue for the Controls team and removed needs-triage Issue needs to be triaged by the area owners labels Mar 3, 2020
@StephenLPeters
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@marcelwgn
Copy link
Collaborator Author

marcelwgn commented Mar 4, 2020

@StephenLPeters @kmahone Do you have any ideas, what could have caused that failure? Should I pull and merge master in this branch again?

Yes. Please. There was an infrastructure issue that was causing it that has been fixed in master. This should be resolved if you merge master.

@ranjeshj ranjeshj requested a review from chrisglein March 4, 2020 17:07
@ranjeshj ranjeshj added area-TextBlocks TextBlock, RichTextBlock area-TextBox TextBox, RichEditBox labels Mar 4, 2020
@ranjeshj
Copy link
Contributor

ranjeshj commented Mar 4, 2020

@chigy @YuliKl as FYI

@robloo
Copy link
Contributor

robloo commented Mar 4, 2020

This is so cool to see coming to a close. This styling was one of the first 'quirks' in UWP I noticed switching over from WPF that just didn't seem right. It's great this is finally being closed. @chingucoding you are awesome to spend the time improving things like this!!

@marcelwgn
Copy link
Collaborator Author

That was also something that was a bit unusual in UWP. Luckily we seem to be able to change this now!

PS: Thank you for your kind words @robloo 😄

@chigy
Copy link
Member

chigy commented Mar 4, 2020

@chingucoding , did you test this change on Editable Combobox?

@marcelwgn
Copy link
Collaborator Author

@chigy Editable ComboBox also works:

editable-combobox-darkmode

Numberbox also works correctly

@ranjeshj
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@StephenLPeters StephenLPeters left a comment

Choose a reason for hiding this comment

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

:shipit:

@ranjeshj ranjeshj requested a review from chigy March 18, 2020 22:30
Copy link
Member

@chigy chigy left a comment

Choose a reason for hiding this comment

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

Change looks good

@ranjeshj ranjeshj merged commit c0fb694 into microsoft:master Mar 23, 2020
@msft-github-bot
Copy link
Collaborator

🎉Microsoft.UI.Xaml v2.4.0-prerelease.200422001 has been released which incorporates this pull request.:tada:

Handy links:

@Gavin-Williams
Copy link

Gavin-Williams commented Jul 19, 2020

This is still happening in the default WinUI 3 RichEditBox;

#2953

@StephenLPeters
Copy link
Contributor

This is still happening in the default WinUI 3 RichEditBox;

#2953

@llongley which version of winui 2 is in the winui3 preview?

@ranjeshj
Copy link
Contributor

2.4.2

@StephenLPeters
Copy link
Contributor

2.4.2

So this fix should be in the winui3 preview 2. @Gavin-Williams To confirm, you were using preview 2 correct?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-Styling area-TextBlocks TextBlock, RichTextBlock area-TextBox TextBox, RichEditBox team-Controls Issue for the Controls team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TextBox/RichEditBox Shouldn't Force Light Theme on Focus
7 participants