Upgrade to Microsoft.UI.Xaml 2.2 #3027

DHowett-MSFT · 2019-10-02T01:00:48Z

This pull request introduces the code changes required to move to MUX 2.2
final.

We had to move to the final API:
- Items -> TabItems
- Items.VectorChanged -> TabItemsChanged
- TabClose -> TabCloseRequested
- TabViewItem.Icon -> TabViewItem.IconSource
TabRowControl has been converted to a ContentPresenter, which
simplifies its logic a little bit.
TerminalPage now differentiates MUX and WUX a little better
Because of the change from Icon to IconSource in TabViewItem,
Utils::GetColoredIcon needed to be augmented to support MUX IconSources.
It was still necessary to use for WUX, so it's been templatized.
I moved us from WUX SplitButton to MUX SplitButton and brought the
style in line with the one typically provided by TabView.
Some of our local controls have had their backgrounds removed so
they're more amenable to being placed on other surfaces.
I'm suppressing the TabView's padding.
I removed a number of apparently dead methods from App.
I've simplified the dragbar's sizing logic and eventing.
The winmd harvester needed to be taught to not try to copy winmds for framework packages.

PR Checklist

Closes Move to Microsoft.UI.Xaml 2.2.1907xxxxx-prerelease #1896, Closes It is not possible to scroll tabs list without touch screen #444, Closes Tabs in title bar are cut off when scrolling the tabs + tabs not scrolling automatically #857, Closes The default 'active' tab contrast is very low #771, Closes Microsoft.UI.Xaml causes an exception when any flyout menus are generated #760
CLA signed
Go go core contributor status!

Validation Steps Performed

It's tabs, and they do a good. I tried them all.

References

Enables More complete tab sizing configurations #597, but does not fix it

This commit introduces the code changes required to move to MUX 2.2 final. * We had to move to the final API: * Items -> TabItems * Items.VectorChanged -> TabItemsChanged * TabClose -> TabCloseRequested * TabViewItem.Icon -> TabViewItem.IconSource * TabRowControl has been converted to a ContentPresenter, which simplifies its logic a little bit. * TerminalPage now differentiates MUX and WUX a little better * Because of the change from Icon to IconSource in TabViewItem, Utils::GetColoredIcon needed to be augmented to support MUX IconSources. It was still necessary to use for WUX, so it's been templatized. * I moved us from WUX SplitButton to MUX SplitButton and brought the style in line with the one typically provided by TabView. * Some of our local controls have had their backgrounds removed so they're more amenable to being placed on other surfaces. * I'm suppressing the TabView's padding. * I removed a number of apparently dead methods from App. * I've simplified the dragbar's sizing logic and eventing.

DHowett-MSFT · 2019-10-02T01:05:38Z

KNOWN ISSUES

The terminal will immediately crash on launch because an initialization order change made it so we try to init at 0x0
The tab view will only get smaller when resized, it will never get larger. It'll snap to the right size when a tab is added/removed.

carlos-zamora · 2019-10-02T17:04:44Z

src/cascadia/TerminalApp/TerminalPage.cpp

            feedbackFlyout.Text(_resourceLoader->GetLocalizedString(L"FeedbackMenuItem"));

-            Controls::FontIcon feedbackIco{};
+            WUX::Controls::FontIcon feedbackIco{};


While you're here, mind changing the name to feedbackIcon? :)

src/cascadia/TerminalApp/TitlebarControl.idl

carlos-zamora · 2019-10-02T17:13:30Z

src/cascadia/TerminalApp/Utils.cpp

@@ -16,33 +16,3 @@ std::wstring GetWstringFromJson(const Json::Value& json)
 {


Since we just moved GetColoredIcon() to the header file, why not move this one too? One less file to worry about.

i don't hate it. I'd prefer to do that in a separate PR (and make it templatable :P)

zadjii-msft · 2019-10-02T17:49:47Z

I'd argue that #597 is not closed by this PR - we still need to add some settings to control that. However, now we can add those settings.

DHowett-MSFT · 2019-10-02T17:51:34Z

I'd argue that #597 is not closed by this PR - we still need to add some settings to control that. However, now we can add those settings.

Good call -- yoink it from my desc'n plz 😄

zadjii-msft

re: known issues:

How bad is this crashing? How frequently/under what circumstances? Do we have LOS on a root cause? I'd rather not add a totally unknown crash, even if the rest of this PR is goodness.
Presumably the tab sizing one is an upstream issue - anything we can do to mitigate in the meantime? Can we link the upstream issue here/somewhere?

zadjii-msft · 2019-10-02T17:50:12Z

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -339,4 +339,12 @@
    </ItemGroup>
  </Target>

+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets')" />


These ^M's look erroneous...

oops thanks

zadjii-msft · 2019-10-02T17:54:16Z

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets'))" />
+  </Target>


Also wait why was this added to the packaging project?

ugh, this is so annoying. this is how the framework pkg dep gets into the appxmanifest

i'll comment it

zadjii-msft · 2019-10-02T18:04:26Z

src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp

-
-    // When the size of the titlebar content changes, we want to make sure to
-    // update the size of the drag region as well.
-    const auto fwe = content.try_as<winrt::Windows::UI::Xaml::FrameworkElement>();


Why was this safe to remove?

we had 3 places where we were registering "drag bar size changed" on three different things; all we really need is the one on the real drag bar space.

DHowett-MSFT · 2019-10-02T18:11:23Z

Crashing: 100% of the time all the time

cinnamon-msft · 2019-10-02T18:11:51Z

KNOWN ISSUES

The terminal will immediately crash on launch because an initialization order change made it so we try to init at 0x0

Do we have a way to fix this asap?

DHowett-MSFT · 2019-10-02T18:12:47Z

I have LOS on why it's happening, but i hate my hack fix for it (defer init until first resize)

DHowett-MSFT · 2019-10-02T22:24:40Z

/azp run

azure-pipelines · 2019-10-02T22:24:45Z

Pull request contains merge conflicts.

DHowett-MSFT · 2019-10-02T22:25:42Z

Oh. Derp.

miniksa · 2019-10-03T21:28:38Z

Crashing: 100% of the time all the time

I'm not OK taking it until this is resolved one way or another.

miniksa

This looks fine to me, but I don't want to sign-off while it 100% crashes.

DHowett-MSFT · 2019-10-03T21:35:20Z

Yes, merging it would be dangerous for our community.

oops

DHowett-MSFT · 2019-10-07T21:37:03Z

The crash no longer abides.

carlos-zamora · 2019-10-09T16:50:22Z

@DHowett-MSFT What's the deal with x86 failing?

DHowett-MSFT · 2019-10-09T17:50:19Z

Who even knows!

miniksa

The crash no longer abides.

I'm now fine with this.

DHowett-MSFT · 2019-10-15T05:28:59Z

I'm not yet ready to merge this -- I want to make sure the local test infrastructure still works.

DHowett-MSFT · 2019-10-15T05:40:30Z

The local tests are reported broken in an e-mail from @zadjii-msft to the TAEF team; i have not regressed them.

ghost · 2019-10-23T19:55:39Z

🎉Windows Terminal Preview v0.6.2951.0 has been released which incorporates this pull request.:tada:

Handy links:

DHowett added 2 commits October 1, 2019 16:56

Build changes to move to MUX 2.2.190917002

8a2f2d9

DHowett-MSFT requested review from carlos-zamora, zadjii-msft and cinnamon-msft October 2, 2019 01:00

re-code the format

91bf6ff

carlos-zamora reviewed Oct 2, 2019

View reviewed changes

carlos-zamora previously approved these changes Oct 2, 2019

View reviewed changes

zadjii-msft reviewed Oct 2, 2019

View reviewed changes

CR feedback I

e9916f7

miniksa reviewed Oct 3, 2019

View reviewed changes

DHowett-MSFT mentioned this pull request Oct 6, 2019

NOT DISPLAYING ALL OPENED TABS IN TAB LAYOUT. #3068

Closed

Only initialize the terminal once we know the size

93dcdc4

Merge remote-tracking branch 'github/master' into dev/duhowett/mux-2.2

eb4095f

cinnamon-msft approved these changes Oct 7, 2019

View reviewed changes

Theme the SplitButton even closer to the TabView button

02d507b

j4james mentioned this pull request Oct 10, 2019

If existing tabs exceed the windows size, new ones are not visible anymore, therefore not easily interactable with #3143

Closed

cinnamon-msft added the Needs-Second It's a PR that needs another sign-off label Oct 14, 2019

DHowett-MSFT mentioned this pull request Oct 14, 2019

Feature Request: allow to pick the color of the tabs #2994

Closed

miniksa approved these changes Oct 14, 2019

View reviewed changes

carlos-zamora approved these changes Oct 15, 2019

View reviewed changes

this unfortunately fixes the build

b2dda8f

DHowett-MSFT merged commit df26c67 into master Oct 15, 2019

DHowett-MSFT mentioned this pull request Oct 15, 2019

Make sure we resize the region even when the drag bar didn't change #3214

Merged

5 tasks

skyline75489 mentioned this pull request Oct 16, 2019

Tabs don't appear after adding a lot of them #3220

Closed

miniksa deleted the dev/duhowett/mux-2.2 branch October 17, 2019 18:03

DHowett-MSFT mentioned this pull request Oct 17, 2019

Copy and paste from the Windows Terminal doesn't include line breaks #1073

Closed

jghal mentioned this pull request Oct 30, 2019

Terminal crashes on launch in Windows.UI.Xaml.dll #3381

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to Microsoft.UI.Xaml 2.2 #3027

Upgrade to Microsoft.UI.Xaml 2.2 #3027

DHowett-MSFT commented Oct 2, 2019 •

edited by zadjii-msft

Loading

DHowett-MSFT commented Oct 2, 2019

carlos-zamora Oct 2, 2019

carlos-zamora Oct 2, 2019

DHowett-MSFT Oct 2, 2019

zadjii-msft commented Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

zadjii-msft left a comment

zadjii-msft Oct 2, 2019

DHowett-MSFT Oct 2, 2019

zadjii-msft Oct 2, 2019

DHowett-MSFT Oct 2, 2019

DHowett-MSFT Oct 2, 2019

zadjii-msft Oct 2, 2019

DHowett-MSFT Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

cinnamon-msft commented Oct 2, 2019

KNOWN ISSUES

DHowett-MSFT commented Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

azure-pipelines bot commented Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

miniksa commented Oct 3, 2019

miniksa left a comment

DHowett-MSFT commented Oct 3, 2019

DHowett-MSFT commented Oct 7, 2019

carlos-zamora commented Oct 9, 2019

DHowett-MSFT commented Oct 9, 2019

miniksa left a comment

DHowett-MSFT commented Oct 15, 2019

DHowett-MSFT commented Oct 15, 2019

ghost commented Oct 23, 2019

		@@ -16,33 +16,3 @@ std::wstring GetWstringFromJson(const Json::Value& json)
		{

Upgrade to Microsoft.UI.Xaml 2.2 #3027

Upgrade to Microsoft.UI.Xaml 2.2 #3027

Conversation

DHowett-MSFT commented Oct 2, 2019 • edited by zadjii-msft Loading

PR Checklist

Validation Steps Performed

References

DHowett-MSFT commented Oct 2, 2019

KNOWN ISSUES

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zadjii-msft commented Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

zadjii-msft left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DHowett-MSFT commented Oct 2, 2019

cinnamon-msft commented Oct 2, 2019

KNOWN ISSUES

DHowett-MSFT commented Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

azure-pipelines bot commented Oct 2, 2019

DHowett-MSFT commented Oct 2, 2019

miniksa commented Oct 3, 2019

miniksa left a comment

Choose a reason for hiding this comment

DHowett-MSFT commented Oct 3, 2019

DHowett-MSFT commented Oct 7, 2019

carlos-zamora commented Oct 9, 2019

DHowett-MSFT commented Oct 9, 2019

miniksa left a comment

Choose a reason for hiding this comment

DHowett-MSFT commented Oct 15, 2019

DHowett-MSFT commented Oct 15, 2019

ghost commented Oct 23, 2019

DHowett-MSFT commented Oct 2, 2019 •

edited by zadjii-msft

Loading