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.

Sign up for GitHub

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

Jump to bottom

Update to MUX 2.7 #11240

Merged
8 commits merged into from
Sep 20, 2021
Merged

Update to MUX 2.7 #11240

8 commits merged into from
Sep 20, 2021

Conversation

zadjii-msft
Copy link
Member

@ghost ghost added Area-Build Issues pertaining to the build system, CI, infrastructure, meta Area-User Interface Issues pertaining to the user interface of the Console or Terminal Issue-Bug It either shouldn't be doing this or needs an investigation. Issue-Task It's a feature request, but it doesn't really need a major design. Priority-3 A description (P3) Product-Terminal The new Windows Terminal. labels Sep 15, 2021
carlos-zamora
carlos-zamora approved these changes Sep 15, 2021
View reviewed changes
Copy link
Member

@carlos-zamora carlos-zamora left a comment

Choose a reason for hiding this comment

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

YES! 🎉🎉🎉

src/cascadia/TerminalApp/App.xaml
@@ -20,7 +20,8 @@
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!-- Include the MUX Controls resources -->
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
ControlsResourcesVersion="Version1" />
Copy link
Member

Choose a reason for hiding this comment

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

Curious: Why did we have to add the version here?

Copy link
Member Author

Choose a reason for hiding this comment

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

totally unfounded guess: this opts us out of the win11 styles, until we're ready to actually ingest them. Dustin did it in the original PR

Copy link
Member

Choose a reason for hiding this comment

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

Correct.

@zadjii-msft
Copy link
Member Author

Blocking because this explodes on 19H1 ☹️

@msftbot make sure @DHowett signs off on this

DHowett
DHowett requested changes Sep 15, 2021
View reviewed changes
Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

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

f

@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 15, 2021
@zadjii-msft zadjii-msft removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Sep 16, 2021
@zadjii-msft zadjii-msft requested a review from DHowett September 20, 2021 14:56
@zadjii-msft zadjii-msft added the AutoMerge Marked for automatic merge by the bot when requirements are met label Sep 20, 2021
@ghost
Copy link

ghost commented Sep 20, 2021

Hello @zadjii-msft!

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.

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.

DHowett
DHowett approved these changes Sep 20, 2021
View reviewed changes
Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

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

I wish this didn't explode our msixbundle by 10MB, but what can ya do

@ghost ghost merged commit cfe14e8 into main Sep 20, 2021
@ghost ghost deleted the dev/migrie/mux-2.7 branch September 20, 2021 22:09
zadjii-msft added a commit that referenced this pull request Sep 29, 2021
@zadjii-msft
Allow the entire Tab to be hit testable again
a809348 
  DESPITE the fact that there's a `Background()` API that we
  could just call like:

  ```c++
      TabViewItem().Background(deselectedTabBrush);
  ```

  We actually can't, because it will make the part of the tab that
  doesn't contain the text totally transparent to hit tests. So we
  actually _do_ still need to set `TabViewItemHeaderBackground` manually.

  * Regressed in #11240
  * Root cause up in microsoft/microsoft-ui-xaml#3769
  * [x] closes #11294
@zadjii-msft zadjii-msft mentioned this pull request Sep 29, 2021
Merged
1 task
ghost pushed a commit that referenced this pull request Sep 29, 2021
@zadjii-msft
Allow the entire Tab to be hit testable again (#11369)
ba23902 
DESPITE the fact that there's a `Background()` API that we
could just call like:

```c++
  TabViewItem().Background(deselectedTabBrush);
```

We actually can't, because it will make the part of the tab that
doesn't contain the text totally transparent to hit tests. So we
actually _do_ still need to set `TabViewItemHeaderBackground` manually.

* Regressed in #11240
* Root cause up in microsoft/microsoft-ui-xaml#3769
* [x] closes #11294
@zadjii-msft zadjii-msft mentioned this pull request Oct 4, 2021
Merged
2 tasks
ghost pushed a commit that referenced this pull request Oct 5, 2021
@zadjii-msft
Fix the tab color, part III (#11413)
6295c8c 
I've had a hard time with the tab colors this week.

Turns out that setting the background to nullptr will make the tabviewitem invisible to hit tests. `Transparent`, on the other hand, is totally valid, and the expected default. 

Tabs as of this commit:

![tab-color-fix-3](https://user-images.githubusercontent.com/18356694/135915272-ff90b28b-f260-493e-bf0b-3450b4702dce.gif)

## PR Checklist
* [x] Closes #11382
* [x] I work here

This low-key reverts a bit of #11369, which fixed #11294, which regressed in #11240
@ghost
Copy link

ghost commented Oct 20, 2021

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

Handy links:

This was referenced Oct 20, 2021
Closed
Closed
Closed
@DavidZidar DavidZidar mentioned this pull request Oct 23, 2021
Open
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlos-zamora carlos-zamora carlos-zamora approved these changes

@DHowett DHowett DHowett approved these changes

Assignees
No one assigned
Labels
Area-Build Issues pertaining to the build system, CI, infrastructure, meta Area-User Interface Issues pertaining to the user interface of the Console or Terminal AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Issue-Task It's a feature request, but it doesn't really need a major design. Priority-3 A description (P3) Product-Terminal The new Windows Terminal.
Projects
None yet
Milestone
No milestone
3 participants
@zadjii-msft @DHowett @carlos-zamora