reconnect context menu

- remove redundant files
- disable the alpha settings in the color picker
- move the winrt/Windows.UI.Popups.h to pch.h
- move the VisualState switching code to a helper method
- use weak ptr in the color pickup flyout
- use weak_ptr in lambdas instead of [this]

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -15,6 +15,7 @@ using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
+using namespace winrt::Windows::ApplicationModel::DataTransfer;
 
 namespace TerminalAppLocalTests
 {

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -39,6 +39,8 @@ Author(s):
 #include "../../types/inc/utils.hpp"
 #include "../../inc/DefaultSettings.h"
 
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
+#include "winrt/Windows.UI.Xaml.Markup.h"
 #include <winrt/Windows.system.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>

src/cascadia/LocalTests_TerminalApp/pch.h.orig

@@ -0,0 +1,63 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- precomp.h
+
+Abstract:
+- Contains external headers to include in the precompile phase of console build process.
+- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
+
+Author(s):
+- Carlos Zamora (cazamor) April 2019
+--*/
+
+#pragma once
+
+// This includes support libraries from the CRT, STL, WIL, and GSL
+#include "LibraryIncludes.h"
+// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
+//      SDK definition of this function, so the only fix is to undef it.
+// from WinBase.h
+// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
+#include <wil/cppwinrt.h>
+#include <unknwn.h>
+#include <hstring.h>
+
+#include <WexTestClass.h>
+#include <json.h>
+#include "consoletaeftemplates.hpp"
+
+// Common includes for most tests:
+#include "../../inc/argb.h"
+#include "../../inc/conattrs.hpp"
+#include "../../types/inc/utils.hpp"
+#include "../../inc/DefaultSettings.h"
+
+<<<<<<< HEAD:src/cascadia/LocalTests_TerminalApp/precomp.h
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
+#include "winrt/Windows.UI.Xaml.Markup.h"
+=======
+#include <winrt/Windows.system.h>
+>>>>>>> master:src/cascadia/LocalTests_TerminalApp/pch.h
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/windows.ui.core.h>
+#include <winrt/Windows.ui.input.h>
+#include <winrt/Windows.UI.Xaml.Controls.h>
+#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Windows.ui.xaml.media.h>
+#include <winrt/Windows.ui.xaml.input.h>
+
+#include <windows.ui.xaml.media.dxinterop.h>
+
+#include <winrt/windows.applicationmodel.core.h>
+
+#include <winrt/Microsoft.Terminal.TerminalConnection.h>
+
+#include <winrt/Microsoft.UI.Xaml.Controls.h>

src/cascadia/TerminalApp/ColorPickupFlyout.cpp

@@ -0,0 +1,112 @@
+#include "pch.h"
+#include "ColorPickupFlyout.h"
+#include "ColorPickupFlyout.g.cpp"
+#include "winrt/Windows.UI.Xaml.Media.h"
+#include "winrt/Windows.UI.Xaml.Shapes.h"
+#include "winrt/Windows.UI.Xaml.Interop.h"
+#include <LibraryResources.h>
+
+namespace winrt::TerminalApp::implementation
+{
+    // Method Description:
+    // - Default constructor, localizes the buttons and hooks
+    // up the event fired by the custom color picker, so that
+    // the tab color is set on the fly when selecting a non-preset color
+    // Arguments:
+    // - <none>
+    ColorPickupFlyout::ColorPickupFlyout()
+    {
+        InitializeComponent();
+
+        auto okText = RS_(L"Ok");
+        auto customColorText = RS_(L"TabCustomColorChoose");
+        auto clearColorText = RS_(L"TabColorClear");
+
+        btnOk().Content(winrt::box_value(okText));
+        btnCustomColor().Content(winrt::box_value(customColorText));
+        btnClearColor().Content(winrt::box_value(clearColorText));
+
+        customColorPicker().ColorChanged({ get_weak(), &ColorPickupFlyout::_ColorChangedHandler });
+    }
+
+    // Method Description:
+    // - Handler of the click event for the preset color swatches.
+    // Reads the color from the clicked rectangle and fires an event
+    // with the selected color. After that hides the flyout
+    // Arguments:
+    // - sender: the rectangle that got clicked
+    // Return Value:
+    // - <none>
+    void ColorPickupFlyout::ColorButton_Click(IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const&)
+    {
+        auto btn{ sender.as<Windows::UI::Xaml::Controls::Button>() };
+        auto rectangle{ btn.Content().as<Windows::UI::Xaml::Shapes::Rectangle>() };
+        auto rectClr{ rectangle.Fill().as<Windows::UI::Xaml::Media::SolidColorBrush>() };
+        _colorSelected(rectClr.Color());
+        Hide();
+    }
+
+    // Method Description:
+    // - Handler of the clear color button. Clears the current
+    // color of the tab, if any. Hides the flyout after that
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void ColorPickupFlyout::ClearColorButton_Click(IInspectable const&, Windows::UI::Xaml::RoutedEventArgs const&)
+    {
+        _colorCleared();
+        Hide();
+    }
+
+    // Method Description:
+    // - Handler of the select custom color button. Expands or collapses the flyout
+    // to show the color picker. In order to accomplish this a FlyoutPresenterStyle is used,
+    // in which a Style is embedded, containing the desired width
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void ColorPickupFlyout::ShowColorPickerButton_Click(Windows::Foundation::IInspectable const&, Windows::UI::Xaml::RoutedEventArgs const&)
+    {
+        auto targetType = this->FlyoutPresenterStyle().TargetType();
+        auto s = Windows::UI::Xaml::Style{};
+        s.TargetType(targetType);
+        auto visibility = customColorPanel().Visibility();
+        if (visibility == winrt::Windows::UI::Xaml::Visibility::Collapsed)
+        {
+            customColorPanel().Visibility(winrt::Windows::UI::Xaml::Visibility::Visible);
+            auto setter = Windows::UI::Xaml::Setter(Windows::UI::Xaml::FrameworkElement::MinWidthProperty(), winrt::box_value(540));
+            s.Setters().Append(setter);
+        }
+        else
+        {
+            customColorPanel().Visibility(winrt::Windows::UI::Xaml::Visibility::Collapsed);
+            auto setter = Windows::UI::Xaml::Setter(Windows::UI::Xaml::FrameworkElement::MinWidthProperty(), winrt::box_value(0));
+            s.Setters().Append(setter);
+        }
+        this->FlyoutPresenterStyle(s);
+    }
+
+    // Method Description:
+    // - Handles the color selection of the color pickup. Gets
+    // the currently selected color and fires an event with it
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void ColorPickupFlyout::CustomColorButton_Click(Windows::Foundation::IInspectable const&, Windows::UI::Xaml::RoutedEventArgs const&)
+    {
+        auto color = customColorPicker().Color();
+        _colorSelected(color);
+        Hide();
+    }
+
+    void ColorPickupFlyout::_ColorChangedHandler(const Windows::UI::Xaml::Controls::ColorPicker&, const Windows::UI::Xaml::Controls::ColorChangedEventArgs& args)
+    {
+        _colorSelected(args.NewColor());
+    }
+
+    DEFINE_EVENT(ColorPickupFlyout, ColorSelected, _colorSelected, TerminalApp::ColorSelectedArgs);
+    DEFINE_EVENT(ColorPickupFlyout, ColorCleared, _colorCleared, TerminalApp::ColorClearedArgs);
+}

src/cascadia/TerminalApp/ColorPickupFlyout.h

@@ -0,0 +1,29 @@
+#pragma once
+#include "ColorPickupFlyout.g.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace winrt::TerminalApp::implementation
+{
+    struct ColorPickupFlyout : ColorPickupFlyoutT<ColorPickupFlyout>
+    {
+        ColorPickupFlyout();
+
+        void ColorButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+        void ShowColorPickerButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+        void CustomColorButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+        void ClearColorButton_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& args);
+
+        DECLARE_EVENT(ColorSelected, _colorSelected, TerminalApp::ColorSelectedArgs);
+        DECLARE_EVENT(ColorCleared, _colorCleared, TerminalApp::ColorClearedArgs);
+
+    private:
+        void _ColorChangedHandler(const Windows::UI::Xaml::Controls::ColorPicker&, const Windows::UI::Xaml::Controls::ColorChangedEventArgs& args);
+    };
+}
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    struct ColorPickupFlyout : ColorPickupFlyoutT<ColorPickupFlyout, implementation::ColorPickupFlyout>
+    {
+    };
+}

src/cascadia/TerminalApp/ColorPickupFlyout.idl

@@ -0,0 +1,12 @@
+namespace TerminalApp
+{
+    delegate void ColorSelectedArgs(Windows.UI.Color color);
+    delegate void ColorClearedArgs();
+    
+    [default_interface] runtimeclass ColorPickupFlyout : Windows.UI.Xaml.Controls.Flyout
+    {
+        ColorPickupFlyout();
+        event ColorSelectedArgs ColorSelected;
+        event ColorClearedArgs ColorCleared;
+    }
+}

src/cascadia/TerminalApp/ColorPickupFlyout.xaml

@@ -0,0 +1,151 @@
+<Flyout
+    x:Class="TerminalApp.ColorPickupFlyout"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:TerminalApp"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <Flyout.FlyoutPresenterStyle>
+        <Style TargetType="FlyoutPresenter">
+            <Setter Property="MinWidth" Value="0"/>
+        </Style>
+    </Flyout.FlyoutPresenterStyle>
+    <StackPanel Orientation="Horizontal">
+        <StackPanel>
+            <VariableSizedWrapGrid Orientation="Horizontal" MaximumRowsOrColumns="4" HorizontalAlignment="Center" Margin="0, 3, 0, 0">
+                <VariableSizedWrapGrid.Resources>
+                    <Style TargetType="Rectangle">
+                        <Setter Property="Width" Value="30"/>
+                        <Setter Property="Height" Value="30"/>
+                    </Style>
+                    <Style TargetType="Button">
+                        <Setter Property="Padding" Value="0"/>
+                        <Setter Property="Margin" Value="2"/>
+                    </Style>
+                </VariableSizedWrapGrid.Resources>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="Crimson">
+                    <Button.Content>
+                        <Rectangle Fill="Crimson"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="SteelBlue">
+                    <Button.Content>
+                        <Rectangle Fill="SteelBlue"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="MediumSeaGreen">
+                    <Button.Content>
+                        <Rectangle Fill="MediumSeaGreen"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="DarkOrange">
+                    <Button.Content>
+                        <Rectangle Fill="DarkOrange"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="MediumVioletRed">
+                    <Button.Content>
+                        <Rectangle Fill="MediumVioletRed"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="DodgerBlue">
+                    <Button.Content>
+                        <Rectangle Fill="DodgerBlue"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="LimeGreen">
+                    <Button.Content>
+                        <Rectangle Fill="LimeGreen"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="Yellow">
+                    <Button.Content>
+                        <Rectangle Fill="Yellow"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="BlueViolet">
+                    <Button.Content>
+                        <Rectangle Fill="BlueViolet"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="SlateBlue">
+                    <Button.Content>
+                        <Rectangle Fill="SlateBlue"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="Lime">
+                    <Button.Content>
+                        <Rectangle Fill="Lime"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="Tan">
+                    <Button.Content>
+                        <Rectangle Fill="Tan"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="Magenta">
+                    <Button.Content>
+                        <Rectangle Fill="Magenta"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="Cyan">
+                    <Button.Content>
+                        <Rectangle Fill="Cyan"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="SkyBlue">
+                    <Button.Content>
+                        <Rectangle Fill="SkyBlue"/>
+                    </Button.Content>
+                </Button>
+                <Button Click="ColorButton_Click" AutomationProperties.Name="DarkGray">
+                    <Button.Content>
+                        <Rectangle Fill="DarkGray"/>
+                    </Button.Content>
+                </Button>
+            </VariableSizedWrapGrid>
+            <StackPanel HorizontalAlignment="Center">
+                <StackPanel.Resources>
+                    <Style TargetType="Button">
+                        <Setter Property="Margin" Value="2" />
+                        <Setter Property="HorizontalAlignment" Value="Stretch" />
+                    </Style>
+                </StackPanel.Resources>
+                <Button Padding="5"
+                    Click="ClearColorButton_Click"
+                    x:Name="btnClearColor">
+                    <Button.Content>
+                        Clear the current color
+                    </Button.Content>
+                </Button>
+                <Button Padding="5"
+                    Click="ShowColorPickerButton_Click"
+                    x:Name="btnCustomColor">
+                    <Button.Content>
+                        Select a custom color
+                    </Button.Content>
+                </Button>
+            </StackPanel>
+        </StackPanel>
+        <Grid Visibility="Collapsed" x:Name="customColorPanel" Margin="5">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <ColorPicker x:Name="customColorPicker" 
+                     IsMoreButtonVisible="True"
+                     IsColorSliderVisible="False"
+                     IsColorChannelTextInputVisible="True"
+                     IsHexInputVisible="True"
+                     IsAlphaEnabled="False"
+                     IsAlphaSliderVisible="False"
+                     IsAlphaTextInputVisible="False"
+                     FontSize="10"
+                     Grid.Row="0"
+                     >
+            </ColorPicker>
+            <Button x:Name="btnOk" Click="CustomColorButton_Click" Grid.Row="1" HorizontalAlignment="Center" MinWidth="130" MinHeight="12" Margin="0, 5, 0, 0">Ok</Button>
+        </Grid>
+    </StackPanel>
+</Flyout>

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -217,6 +217,18 @@ Temporarily using the Windows Terminal default settings.
   <data name="CloseWindowWarningTitle" xml:space="preserve">
     <value>Do you want to close all tabs?</value>
   </data>
+  <data name="TabClose" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="TabColorChoose" xml:space="preserve">
+    <value>Choose a tab color</value>
+  </data>
+  <data name="TabColorClear" xml:space="preserve">
+    <value>Clear the current color</value>
+  </data>
+  <data name="TabCustomColorChoose" xml:space="preserve">
+    <value>Select a custom color</value>
+  </data>
   <data name="InvalidBackgroundImage" xml:space="preserve">
     <value>Found a profile with an invalid "backgroundImage". Defaulting that profile to have no background image. Make sure that when setting a "backgroundImage", the value is a valid file path to an image.</value>
   </data>
@@ -256,4 +268,4 @@ Temporarily using the Windows Terminal default settings.
   <data name="CmdStartingDirArgDesc" xml:space="preserve">
     <value>Open in the given directory instead of the profile's set startingDirectory</value>
   </data>
-</root>
+</root>

src/cascadia/TerminalApp/Tab.cpp

@@ -2,6 +2,8 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
+#include <LibraryResources.h>
+#include "ColorPickupFlyout.h"
 #include "Tab.h"
 #include "Tab.g.cpp"
 #include "Utils.h"
@@ -137,6 +139,7 @@ namespace winrt::TerminalApp::implementation
     {
         _AttachEventHandlersToPane(_rootPane);
         _AttachEventHandlersToControl(control);
+        _CreateContextMenu();
     }
 
     // Method Description:
@@ -420,5 +423,204 @@ namespace winrt::TerminalApp::implementation
         });
     }
 
+    // Method Description:
+    // - Creates a context menu attached to the tab.
+    // Currently contains elements allowing to select or
+    // to close the current tab
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Tab::_CreateContextMenu()
+    {
+        auto newTabFlyout = Controls::MenuFlyout{};
+        auto menuSeparator = Controls::MenuFlyoutSeparator{};
+        auto chooseColorMenuItem = Controls::MenuFlyoutItem{};
+        auto resetColorMenuItem = Controls::MenuFlyoutItem{};
+        auto closeTabMenuItem = Controls::MenuFlyoutItem{};
+
+        auto colorPickSymbol = Controls::FontIcon{};
+        colorPickSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
+        colorPickSymbol.Glyph(L"\xE790");
+
+        auto closeSymbol = Controls::FontIcon{};
+        closeSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
+        closeSymbol.Glyph(L"\xE8BB");
+
+        auto clearAllSymbol = Controls::FontIcon{};
+        clearAllSymbol.FontFamily(Media::FontFamily{ L"Segoe MDL2 Assets" });
+        clearAllSymbol.Glyph(L"\xED62");
+
+        auto tabClose = RS_(L"TabClose");
+        closeTabMenuItem.Text(tabClose);
+        closeTabMenuItem.Icon(closeSymbol);
+
+        auto weakThis{ get_weak() };
+
+        closeTabMenuItem.Click([weakThis](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->ClosePane();
+            }
+        });
+
+        _tabColorPickup.ColorSelected([weakThis](auto newTabColor) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_SetTabColor(newTabColor);
+            }
+        });
+
+        _tabColorPickup.ColorCleared([weakThis]() {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_ResetTabColor();
+            }
+        });
+
+        chooseColorMenuItem.Click([weakThis](auto&&, auto&&) {
+            if (auto tab{ weakThis.get() })
+            {
+                tab->_tabColorPickup.ShowAt(tab->_tabViewItem);
+            }
+        });
+        chooseColorMenuItem.Icon(colorPickSymbol);
+
+        auto tabChooseColorString = RS_(L"TabColorChoose");
+        chooseColorMenuItem.Text(tabChooseColorString);
+
+        newTabFlyout.Items().Append(chooseColorMenuItem);
+        newTabFlyout.Items().Append(menuSeparator);
+        newTabFlyout.Items().Append(closeTabMenuItem);
+        _tabViewItem.ContextFlyout(newTabFlyout);
+    }
+
+    // Method Description:
+    // - Sets the tab background color to the color chosen by the user
+    // - Sets the tab foreground color depending on the luminance of
+    // the background color
+    // Arguments:
+    // - color: the shiny color the user picked for their tab
+    // Return Value:
+    // - <none>
+    void Tab::_SetTabColor(const winrt::Windows::UI::Color& color)
+    {
+        auto weakThis{ get_weak() };
+
+        _tabViewItem.Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [weakThis, color]() {
+            auto ptrTab = weakThis.get();
+            if (!ptrTab)
+                return;
+
+            auto tab{ ptrTab };
+            Media::SolidColorBrush selectedTabBrush{};
+            Media::SolidColorBrush deselectedTabBrush{};
+            Media::SolidColorBrush fontBrush{};
+
+            // see https://www.w3.org/TR/WCAG20/#relativeluminancedef
+            float c[] = { color.R / 255.f, color.G / 255.f, color.B / 255.f };
+            for (int i = 0; i < 3; i++)
+            {
+                if (c[i] <= 0.03928)
+                {
+                    c[i] = c[i] / 12.92f;
+                }
+                else
+                {
+                    c[i] = std::pow((c[i] + 0.055f) / 1.055f, 2.4f);
+                }
+            }
+
+            // calculate the luminance of the current color and select a font
+            // color based on that
+            auto luminance = 0.2126f * c[0] + 0.7152f * c[1] + 0.0722f * c[2];
+            if (luminance > 0.179)
+            {
+                fontBrush.Color(winrt::Windows::UI::Colors::Black());
+            }
+            else
+            {
+                fontBrush.Color(winrt::Windows::UI::Colors::White());
+            }
+
+            selectedTabBrush.Color(color);
+
+            // currently if a tab has a custom color, a deselected state is
+            // signified by using the same color with a bit ot transparency
+            auto deselectedTabColor = color;
+            deselectedTabColor.A = 64;
+            deselectedTabBrush.Color(deselectedTabColor);
+            tab->_tabViewItem.Resources().Insert(winrt::box_value(L"TabViewItemHeaderBackgroundSelected"), selectedTabBrush);
+            tab->_tabViewItem.Resources().Insert(winrt::box_value(L"TabViewItemHeaderBackground"), deselectedTabBrush);
+            tab->_tabViewItem.Resources().Insert(winrt::box_value(L"TabViewItemHeaderBackgroundPointerOver"), selectedTabBrush);
+            tab->_tabViewItem.Resources().Insert(winrt::box_value(L"TabViewItemHeaderForeground"), fontBrush);
+            tab->_tabViewItem.Resources().Insert(winrt::box_value(L"TabViewItemHeaderForegroundSelected"), fontBrush);
+            tab->_tabViewItem.Resources().Insert(winrt::box_value(L"TabViewItemHeaderForegroundPointerOver"), fontBrush);
+
+            tab->_RefreshVisualState();
+        });
+    }
+
+    // Method Description:
+    // Clear the custom color of the tab, if any
+    // the background color
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Tab::_ResetTabColor()
+    {
+        auto weakThis{ get_weak() };
+
+        _tabViewItem.Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [weakThis]() {
+            auto ptrTab = weakThis.get();
+            if (!ptrTab)
+                return;
+
+            auto tab{ ptrTab };
+            winrt::hstring keys[] = {
+                L"TabViewItemHeaderBackground",
+                L"TabViewItemHeaderBackgroundSelected",
+                L"TabViewItemHeaderBackgroundPointerOver",
+                L"TabViewItemHeaderForeground",
+                L"TabViewItemHeaderForegroundSelected",
+                L"TabViewItemHeaderForegroundPointerOver",
+            };
+
+            // simply clear any of the colors in the tab's dict
+            for (auto keyString : keys)
+            {
+                auto key = winrt::box_value(keyString);
+                if (tab->_tabViewItem.Resources().HasKey(key))
+                {
+                    tab->_tabViewItem.Resources().Remove(key);
+                }
+            }
+
+            tab->_RefreshVisualState();
+        });
+    }
+
+    // Method Description:
+    // Toggles the visual state of the tab view item,
+    // so that changes to the tab color are reflected immediately
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Tab::_RefreshVisualState()
+    {
+        if (_focused)
+        {
+            winrt::Windows::UI::Xaml::VisualStateManager::GoToState(_tabViewItem, L"Normal", true);
+            winrt::Windows::UI::Xaml::VisualStateManager::GoToState(_tabViewItem, L"Selected", true);
+        }
+        else
+        {
+            winrt::Windows::UI::Xaml::VisualStateManager::GoToState(_tabViewItem, L"Selected", true);
+            winrt::Windows::UI::Xaml::VisualStateManager::GoToState(_tabViewItem, L"Normal", true);
+        }
+    }
+
     DEFINE_EVENT(Tab, ActivePaneChanged, _ActivePaneChangedHandlers, winrt::delegate<>);
 }

src/cascadia/TerminalApp/Tab.h

@@ -3,6 +3,7 @@
 
 #pragma once
 #include "Pane.h"
+#include "ColorPickupFlyout.h"
 #include "Tab.g.h"
 
 namespace winrt::TerminalApp::implementation
@@ -55,12 +56,17 @@ namespace winrt::TerminalApp::implementation
         std::shared_ptr<Pane> _rootPane{ nullptr };
         std::shared_ptr<Pane> _activePane{ nullptr };
         winrt::hstring _lastIconPath{};
+        winrt::TerminalApp::ColorPickupFlyout _tabColorPickup{};
 
         bool _focused{ false };
         winrt::Microsoft::UI::Xaml::Controls::TabViewItem _tabViewItem{ nullptr };
 
         void _MakeTabViewItem();
         void _Focus();
+        void _CreateContextMenu();
+        void _SetTabColor(const winrt::Windows::UI::Color& color);
+        void _ResetTabColor();
+        void _RefreshVisualState();
 
         void _AttachEventHandlersToControl(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
         void _AttachEventHandlersToPane(std::shared_ptr<Pane> pane);

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -1,70 +1,70 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-the MIT License. See LICENSE in the project root for license information. -->
-<ContentPresenter
-    x:Class="TerminalApp.TabRowControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:TerminalApp"
-    xmlns:mux="using:Microsoft.UI.Xaml.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <mux:TabView x:Name="TabView"
-                 VerticalAlignment="Bottom"
-                 HorizontalContentAlignment="Stretch"
-                 IsAddTabButtonVisible="false"
-                 TabWidthMode="Equal"
-                 CanReorderTabs="True"
-                 CanDragTabs="True"
-                 AllowDropTabs="True">
-
-        <mux:TabView.TabStripFooter>
-            <mux:SplitButton
-                x:Name="NewTabButton"
-                Click="OnNewTabButtonClick"
-                VerticalAlignment="Stretch"
-                HorizontalAlignment="Left"
-                Content="&#xE710;"
-                UseLayoutRounding="true"
-                FontFamily="Segoe MDL2 Assets"
-                FontWeight="SemiLight"
-                FontSize="12">
-                <!-- U+E710 is the fancy plus icon. -->
-                <mux:SplitButton.Resources>
-		    <!-- Override the SplitButton* resources to match the tab view's button's styles. -->
-                    <ResourceDictionary>
-                        <ResourceDictionary.ThemeDictionaries>
-                            <ResourceDictionary x:Key="Light">
-                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
-                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
-                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
-                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
-                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
-                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
-                            </ResourceDictionary>
-                            <ResourceDictionary x:Key="Dark">
-                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
-                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
-                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
-                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
-                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
-                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
-                            </ResourceDictionary>
-                            <ResourceDictionary x:Key="HighContrast">
-                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
-                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
-                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
-                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
-                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
-                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
-                            </ResourceDictionary>
-                        </ResourceDictionary.ThemeDictionaries>
-                    </ResourceDictionary>
-                </mux:SplitButton.Resources>
-            </mux:SplitButton>
-        </mux:TabView.TabStripFooter>
-
-    </mux:TabView>
-
-</ContentPresenter>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+the MIT License. See LICENSE in the project root for license information. -->
+<ContentPresenter
+    x:Class="TerminalApp.TabRowControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:TerminalApp"
+    xmlns:mux="using:Microsoft.UI.Xaml.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <mux:TabView x:Name="TabView"
+                 VerticalAlignment="Bottom"
+                 HorizontalContentAlignment="Stretch"
+                 IsAddTabButtonVisible="false"
+                 TabWidthMode="Equal"
+                 CanReorderTabs="True"
+                 CanDragTabs="True"
+                 AllowDropTabs="True">
+
+        <mux:TabView.TabStripFooter>
+            <mux:SplitButton
+                x:Name="NewTabButton"
+                Click="OnNewTabButtonClick"
+                VerticalAlignment="Stretch"
+                HorizontalAlignment="Left"
+                Content="&#xE710;"
+                UseLayoutRounding="true"
+                FontFamily="Segoe MDL2 Assets"
+                FontWeight="SemiLight"
+                FontSize="12">
+                <!-- U+E710 is the fancy plus icon. -->
+                <mux:SplitButton.Resources>
+                    <!-- Override the SplitButton* resources to match the tab view's button's styles. -->
+                    <ResourceDictionary>
+                        <ResourceDictionary.ThemeDictionaries>
+                            <ResourceDictionary x:Key="Light">
+                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
+                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
+                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
+                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="Dark">
+                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
+                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
+                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
+                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="HighContrast">
+                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
+                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
+                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
+                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                            </ResourceDictionary>
+                        </ResourceDictionary.ThemeDictionaries>
+                    </ResourceDictionary>
+                </mux:SplitButton.Resources>
+            </mux:SplitButton>
+        </mux:TabView.TabStripFooter>
+
+    </mux:TabView>
+
+</ContentPresenter>

src/cascadia/TerminalApp/TabRowControl.xaml.orig

@@ -0,0 +1,90 @@
+<<<<<<< HEAD
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+the MIT License. See LICENSE in the project root for license information. -->
+<ContentPresenter
+    x:Class="TerminalApp.TabRowControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:TerminalApp"
+    xmlns:mux="using:Microsoft.UI.Xaml.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <mux:TabView x:Name="TabView"
+                 VerticalAlignment="Bottom"
+                 HorizontalContentAlignment="Stretch"
+                 IsAddTabButtonVisible="false"
+                 TabWidthMode="SizeToContent"
+=======
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+the MIT License. See LICENSE in the project root for license information. -->
+<ContentPresenter
+    x:Class="TerminalApp.TabRowControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:TerminalApp"
+    xmlns:mux="using:Microsoft.UI.Xaml.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <mux:TabView x:Name="TabView"
+                 VerticalAlignment="Bottom"
+                 HorizontalContentAlignment="Stretch"
+                 IsAddTabButtonVisible="false"
+                 TabWidthMode="Equal"
+>>>>>>> master
+                 CanReorderTabs="True"
+                 CanDragTabs="True"
+                 AllowDropTabs="True">
+
+        <mux:TabView.TabStripFooter>
+            <mux:SplitButton
+                x:Name="NewTabButton"
+                Click="OnNewTabButtonClick"
+                VerticalAlignment="Stretch"
+                HorizontalAlignment="Left"
+                Content="&#xE710;"
+                UseLayoutRounding="true"
+                FontFamily="Segoe MDL2 Assets"
+                FontWeight="SemiLight"
+                FontSize="12">
+                <!-- U+E710 is the fancy plus icon. -->
+                <mux:SplitButton.Resources>
+                    <!-- Override the SplitButton* resources to match the tab view's button's styles. -->
+                    <ResourceDictionary>
+                        <ResourceDictionary.ThemeDictionaries>
+                            <ResourceDictionary x:Key="Light">
+                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
+                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
+                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
+                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="Dark">
+                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
+                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
+                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
+                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                            </ResourceDictionary>
+                            <ResourceDictionary x:Key="HighContrast">
+                                <StaticResource x:Key="SplitButtonBackground" ResourceKey="TabViewItemHeaderBackground" />
+                                <StaticResource x:Key="SplitButtonForeground" ResourceKey="SystemControlBackgroundBaseMediumBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPressed" ResourceKey="TabViewItemHeaderBackgroundPressed" />
+                                <StaticResource x:Key="SplitButtonForegroundPressed" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                                <StaticResource x:Key="SplitButtonBackgroundPointerOver" ResourceKey="TabViewItemHeaderBackgroundPointerOver" />
+                                <StaticResource x:Key="SplitButtonForegroundPointerOver" ResourceKey="SystemControlBackgroundBaseMediumHighBrush" />
+                            </ResourceDictionary>
+                        </ResourceDictionary.ThemeDictionaries>
+                    </ResourceDictionary>
+                </mux:SplitButton.Resources>
+            </mux:SplitButton>
+        </mux:TabView.TabStripFooter>
+
+    </mux:TabView>
+
+</ContentPresenter>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -1409,6 +1409,10 @@ namespace winrt::TerminalApp::implementation
             _RemoveTabViewItem(sender.as<MUX::Controls::TabViewItem>());
             eventArgs.Handled(true);
         }
+        else if (eventArgs.GetCurrentPoint(*this).Properties().IsRightButtonPressed())
+        {
+            eventArgs.Handled(true);
+        }
     }
 
     // Method Description:

src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj

@@ -25,7 +25,6 @@
   </PropertyGroup>
   <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
@@ -33,7 +32,6 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
     <!-- HERE BE DRAGONS:
@@ -58,6 +56,9 @@
     <Page Include="../TabRowControl.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="../ColorPickupFlyout.xaml">
+      <SubType>Designer</SubType>
+    </Page>
   </ItemGroup>
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
@@ -77,6 +78,9 @@
     <ClInclude Include="../TabRowControl.h">
       <DependentUpon>../TabRowControl.xaml</DependentUpon>
     </ClInclude>
+    <ClInclude Include="../ColorPickupFlyout.h">
+      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="../Tab.h">
       <DependentUpon>../Tab.idl</DependentUpon>
     </ClInclude>
@@ -133,6 +137,9 @@
     <ClCompile Include="../TabRowControl.cpp">
       <DependentUpon>../TabRowControl.xaml</DependentUpon>
     </ClCompile>
+    <ClCompile Include="../ColorPickupFlyout.cpp">
+      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="../Tab.cpp">
       <DependentUpon>../Tab.idl</DependentUpon>
     </ClCompile>
@@ -209,11 +216,17 @@
       <DependentUpon>../TabRowControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../Tab.idl"/>
+    <Midl Include="../ColorPickupFlyout.idl">
+      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="../Tab.idl" />
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
-    <PRIResource Include="../Resources/en-US/Resources.resw" />
+    <PRIResource Include="../Resources/en-US/Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
     <None Include="../packages.config" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->

src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj.filters

@@ -59,6 +59,8 @@
     <ClCompile Include="../Pane.LayoutSizeNode.cpp">
       <Filter>pane</Filter>
     </ClCompile>
+    <ClCompile Include="../AppCommandlineArgs.cpp" />
+    <ClCompile Include="../Commandline.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../Utils.h" />
@@ -107,6 +109,8 @@
       <Filter>tab</Filter>
     </ClInclude>
     <ClInclude Include="../TelnetGenerator.h" />
+    <ClInclude Include="../AppCommandlineArgs.h" />
+    <ClInclude Include="../Commandline.h" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="../AppLogic.idl">
@@ -141,6 +145,7 @@
     <Page Include="../TitlebarControl.xaml">
       <Filter>controls</Filter>
     </Page>
+    <Page Include="../ColorPickupFlyout.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="app">

src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj.orig

@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CA5CAD1A-9A12-429C-B551-8562EC954746}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>TerminalApp</RootNamespace>
+    <ProjectName>TerminalAppLib</ProjectName>
+    <TargetName>TerminalAppLib</TargetName>
+    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <SubSystem>Console</SubSystem>
+    <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <!--
+      DON'T REDIRECT OUR OUTPUT.
+      Setting this will tell cppwinrt.build.post.props to copy our output from
+      the default OutDir up one level, so the wapproj will be able to find it.
+     -->
+    <NoOutputRedirection>true</NoOutputRedirection>
+    <!--
+      This is an override that, puzzlingly, _forces XBF (XAML binary) embedding_.
+      We have to do this to overcome a layout issue in the WAP packaging project.
+      When we do this, the XBF ends up in resources.pri.
+    -->
+    <DisableEmbeddedXbf>false</DisableEmbeddedXbf>
+  </PropertyGroup>
+  <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
+  <!-- ========================= XAML files ======================== -->
+  <ItemGroup>
+    <!-- HERE BE DRAGONS:
+      For any types that use XAML information, if their .idl and .h aren't
+      marked DependentUpon the corresponding .xaml file, XamlTypeInfo.g.h won't
+      pick it up correctly. -->
+    <ApplicationDefinition Include="..\App.xaml">
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <!-- When we add other user controls, they should go in here as so: -->
+  <ItemGroup>
+    <Page Include="../MinMaxCloseControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="../TerminalPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="../TitlebarControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="../TabRowControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="../ColorPickupFlyout.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <!-- ========================= Headers ======================== -->
+  <ItemGroup>
+    <ClInclude Include="../App.base.h" />
+    <ClInclude Include="../MinMaxCloseControl.h">
+      <DependentUpon>../MinMaxCloseControl.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../TerminalPage.h">
+      <DependentUpon>../TerminalPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="../TitlebarControl.h">
+      <DependentUpon>../TitlebarControl.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../TabRowControl.h">
+      <DependentUpon>../TabRowControl.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../ColorPickupFlyout.h">
+      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../Tab.h" />
+    <ClInclude Include="../Pane.h" />
+    <ClInclude Include="../ColorScheme.h" />
+    <ClInclude Include="../GlobalAppSettings.h" />
+    <ClInclude Include="../Profile.h" />
+    <ClInclude Include="../CascadiaSettings.h" />
+    <ClInclude Include="../KeyChordSerialization.h" />
+    <ClInclude Include="../JsonUtils.h" />
+    <ClInclude Include="../Utils.h" />
+    <ClInclude Include="../DefaultProfileUtils.h" />
+    <ClInclude Include="../TerminalWarnings.h" />
+    <ClInclude Include="../IDynamicProfileGenerator.h" />
+    <ClInclude Include="../PowershellCoreProfileGenerator.h" />
+    <ClInclude Include="../WslDistroGenerator.h" />
+    <ClInclude Include="../AzureCloudShellGenerator.h" />
+<<<<<<< HEAD
+        <ClInclude Include="pch.h" />
+    <ClInclude Include="../ShortcutActionDispatch.h"  >
+=======
+    <ClInclude Include="../TelnetGenerator.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="../ShortcutActionDispatch.h">
+>>>>>>> master
+      <DependentUpon>../ShortcutActionDispatch.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../ActionArgs.h">
+      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../ActionAndArgs.h">
+      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../AppKeyBindings.h">
+      <DependentUpon>../AppKeyBindings.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../App.h">
+      <DependentUpon>../App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="../AppLogic.h">
+      <DependentUpon>../AppLogic.idl</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <!-- ========================= Cpp Files ======================== -->
+  <ItemGroup>
+    <ClCompile Include="../init.cpp" />
+    <ClCompile Include="../MinMaxCloseControl.cpp">
+      <DependentUpon>../MinMaxCloseControl.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../TerminalPage.cpp">
+      <DependentUpon>../TerminalPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="../TitlebarControl.cpp">
+      <DependentUpon>../TitlebarControl.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../TabRowControl.cpp">
+      <DependentUpon>../TabRowControl.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../ColorPickupFlyout.cpp">
+      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../Tab.cpp" />
+    <ClCompile Include="../Pane.cpp" />
+    <ClCompile Include="../ColorScheme.cpp" />
+    <ClCompile Include="../GlobalAppSettings.cpp" />
+    <ClCompile Include="../Profile.cpp" />
+    <ClCompile Include="../CascadiaSettings.cpp" />
+    <ClCompile Include="../CascadiaSettingsSerialization.cpp" />
+    <ClCompile Include="../AppKeyBindingsSerialization.cpp" />
+    <ClCompile Include="../KeyChordSerialization.cpp" />
+    <ClCompile Include="../JsonUtils.cpp" />
+    <ClCompile Include="../Utils.cpp" />
+    <ClCompile Include="../DefaultProfileUtils.cpp" />
+    <ClCompile Include="../PowershellCoreProfileGenerator.cpp" />
+    <ClCompile Include="../WslDistroGenerator.cpp" />
+    <ClCompile Include="../AzureCloudShellGenerator.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="../AppKeyBindings.cpp">
+      <DependentUpon>../AppKeyBindings.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../ShortcutActionDispatch.cpp">
+      <DependentUpon>../ShortcutActionDispatch.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../ActionAndArgs.cpp">
+      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../ActionArgs.cpp">
+      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../App.cpp">
+      <DependentUpon>../App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../AppActionHandlers.cpp">
+      <DependentUpon>../App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="../AppLogic.cpp">
+      <DependentUpon>../AppLogic.idl</DependentUpon>
+    </ClCompile>
+    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
+    you want to use jsoncpp -->
+    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <!-- ========================= idl Files ======================== -->
+  <ItemGroup>
+    <!-- If you add idl files here, make sure to include their implementation's
+    header in TerminalApp.vcxproj (as well as in this file) -->
+    <Midl Include="../App.idl">
+      <DependentUpon>../App.xaml</DependentUpon>
+    </Midl>
+    <Midl Include="../ShortcutActionDispatch.idl" />
+    <Midl Include="../AppKeyBindings.idl" />
+    <Midl Include="../AppLogic.idl" />
+    <Midl Include="../ActionArgs.idl" />
+    <Midl Include="../MinMaxCloseControl.idl">
+      <DependentUpon>../MinMaxCloseControl.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="../TerminalPage.idl">
+      <DependentUpon>../TerminalPage.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="../TitlebarControl.idl">
+      <DependentUpon>../TitlebarControl.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="../TabRowControl.idl">
+      <DependentUpon>../TabRowControl.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+    <Midl Include="../ColorPickupFlyout.idl">
+      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Midl>
+  </ItemGroup>
+  <!-- ========================= Misc Files ======================== -->
+  <ItemGroup>
+    <PRIResource Include="../Resources/en-US/Resources.resw" />
+    <None Include="../packages.config" />
+  </ItemGroup>
+  <!-- ========================= Project References ======================== -->
+  <ItemGroup>
+    <!--
+      the packaging project won't recurse through our dependencies, you have to
+      make sure that if you add a cppwinrt dependency to any of these projects,
+      you also update all the consumers
+    -->
+    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
+      <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <!-- For whatever reason, we can't include the TerminalControl and
+    TerminalSettings projects' winmds via project references. So we'll have to
+    manually include the winmds as References below -->
+  </ItemGroup>
+  <PropertyGroup>
+    <!-- A small helper for paths to the compiled cppwinrt projects -->
+    <_BinRoot Condition="'$(Platform)' != 'Win32'">$(OpenConsoleDir)$(Platform)\$(Configuration)\</_BinRoot>
+    <_BinRoot Condition="'$(Platform)' == 'Win32'">$(OpenConsoleDir)$(Configuration)\</_BinRoot>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- This is a hack to get the ARM64 CI build working. See
+    https://github.com/Microsoft/msbuild/issues/3746 - it looks like MsBuild
+    just has a bug in it.-->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>Warning</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Manually add references to each of our dependent winmds. Mark them as
+    private=false and CopyLocalSatelliteAssemblies=false, so that we don't
+    propogate them upwards (which can make referencing this project result in
+    duplicate type definitions)-->
+    <Reference Include="Microsoft.Terminal.Settings">
+      <HintPath>$(_BinRoot)TerminalSettings\Microsoft.Terminal.Settings.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+    <Reference Include="Microsoft.Terminal.TerminalConnection">
+      <HintPath>$(_BinRoot)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+    <Reference Include="Microsoft.Terminal.TerminalControl">
+      <HintPath>$(_BinRoot)TerminalControl\Microsoft.Terminal.TerminalControl.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+  </ItemGroup>
+  <!-- ====================== Compiler & Linker Flags ===================== -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <!-- ========================= Globals ======================== -->
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+  <!-- Manually include MUX here, instead of importing its targets file. We need
+  to reference its winmd, but very specifically with the
+  CopyLocalSatelliteAssemblies and Private properties set to false, as to not
+  have projects including us double-including MUX's .winmd. The following blob
+  is taken straight from the MUX build targets, with the afformentioned
+  changes.-->
+  <PropertyGroup>
+    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
+    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
+    <_MUXRoot>$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.2.191203001-prerelease\</_MUXRoot>
+    <_MUXAppRoot>$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\</_MUXAppRoot>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Microsoft.UI.XAML -->
+    <Reference Include="$(_MUXRoot)lib\uap10.0\Microsoft.UI.Xaml.winmd">
+      <Implementation>Microsoft.UI.Xaml.dll</Implementation>
+      <IsWinMDFile>true</IsWinMDFile>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <Private>true</Private>
+    </Reference>
+    <ReferenceCopyLocalPaths Include="$(_MUXRoot)runtimes\win10-$(Native-Platform)\native\Microsoft.UI.Xaml.dll" />
+    <ReferenceCopyLocalPaths Include="$(_MUXRoot)runtimes\win10-$(Native-Platform)\native\Microsoft.UI.Xaml.pri" />
+    <!-- Microsoft.UI.XAML.Application -->
+    <Reference Include="$(_MUXAppRoot)lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.winmd">
+      <Implementation>Microsoft.Toolkit.Win32.UI.XamlHost.dll</Implementation>
+      <IsWinMDFile>true</IsWinMDFile>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <Private>false</Private>
+    </Reference>
+    <ReferenceCopyLocalPaths Include="$(_MUXAppRoot)lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
+    <ReferenceCopyLocalPaths Include="$(_MUXAppRoot)runtimes\win10-$(Native-Platform)\native\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
+  </ItemGroup>
+  <!-- End MUX import -->
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.2.191203001-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.2.191203001-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
+  </Target>
+  <!--
+    By default, the PRI file will contain resource paths beginning with the
+    project name. Since we enabled XBF embedding, this *also* includes App.xbf.
+    Well, App.xbf is hardcoded by the framework to be found at the resource ROOT.
+    To make that happen, we have to disable the prepending of the project name
+    to the App xaml files.
+  -->
+  <PropertyGroup>
+    <_GenerateProjectPriFileDependsOn>OpenConsolePlaceAppXbfAtRootOfResourceTree;$(_GenerateProjectPriFileDependsOn)</_GenerateProjectPriFileDependsOn>
+  </PropertyGroup>
+  <Target Name="OpenConsolePlaceAppXbfAtRootOfResourceTree" DependsOnTargets="GetPackagingOutputs">
+    <ItemGroup>
+      <_RelocatedAppXamlData Include="@(PackagingOutputs)" Condition="'%(Filename)' == 'App' and ('%(Extension)' == '.xaml' or '%(Extension)' == '.xbf')" />
+      <PackagingOutputs Remove="@(_RelocatedAppXamlData)" />
+      <PackagingOutputs Include="@(_RelocatedAppXamlData)">
+        <TargetPath>%(Filename)%(Extension)</TargetPath>
+      </PackagingOutputs>
+    </ItemGroup>
+  </Target>
+  <!-- This target will take our defaults.json and stamp it into a .h file that
+  we can include in the code directly. This way, we don't need to worry about
+  failing to load the default settings at runtime. -->
+  <Target Name="_TerminalAppGenerateDefaultsH" Inputs="..\defaults.json" Outputs="Generated Files\defaults.h" BeforeTargets="BeforeClCompile">
+    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\defaults.json -OutPath '&quot;Generated Files\defaults.h&quot;' -VariableName DefaultJson" />
+  </Target>
+  <!-- A different set of defaults for Universal variant -->
+  <Target Name="_TerminalAppGenerateDefaultsUniversalH" Inputs="..\defaults-universal.json" Outputs="Generated Files\defaults-universal.h" BeforeTargets="BeforeClCompile">
+    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\defaults-universal.json -OutPath '&quot;Generated Files\defaults-universal.h&quot;' -VariableName DefaultUniversalJson" />
+  </Target>
+  <!-- Same as above, but for the default profiles.json template -->
+  <Target Name="_TerminalAppGenerateUserSettingsH" Inputs="..\userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
+    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
+  </Target>
+</Project>

src/cascadia/TerminalApp/lib/pch.h

@@ -60,5 +60,6 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 #include <shellapi.h>
 
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Windows.UI.Popups.h>
 
 #include <CLI11/CLI11.hpp>