Add support for setting a tab's color at runtime w/ context menu

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -10,6 +10,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/precomp.h

@@ -41,6 +41,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.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/windows.ui.core.h>

src/cascadia/TerminalApp/ColorFlyoutSubItem.cpp

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "ColorFlyoutSubItem.h"
+#include "Utils.h"
+
+#include "ColorFlyoutSubItem.g.cpp"
+#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
+
+using namespace winrt;
+using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Core;
+using namespace winrt::Windows::System;
+using namespace winrt::Windows::ApplicationModel::DataTransfer;
+using namespace winrt::Windows::UI::Text;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::TerminalConnection;
+using namespace winrt::Microsoft::Terminal::Settings;
+using namespace ::TerminalApp;
+
+namespace winrt
+{
+    namespace MUX = Microsoft::UI::Xaml;
+    using IInspectable = Windows::Foundation::IInspectable;
+}
+
+namespace winrt::ColorFlyoutSubItem::implementation
+{
+    ColorFlyoutSubItem::ColorFlyoutSubItem() {}
+
+    ColorFlyoutSubItem::ColorFlyoutSubItem(std::shared_ptr<ScopedResourceLoader> resourceLoader)
+    {
+        InitializeComponent();
+
+        _resourceLoader = resourceLoader;
+    }
+
+    void ColorFlyoutSubItem::Create()
+    {
+    }
+}

src/cascadia/TerminalApp/ColorFlyoutSubItem.h

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "winrt/Microsoft.UI.Xaml.Controls.h"
+
+#include "ColorFlyoutSubItem.g.h"
+#include "ScopedResourceLoader.h"
+
+#include <winrt/Microsoft.Terminal.TerminalControl.h>
+#include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Windows.ApplicationModel.DataTransfer.h>
+#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
+
+namespace winrt::ColorFlyoutSubItem::implementation
+{
+    struct ColorFlyoutSubItem : ColorFlyoutSubItemT<ColorFlyoutSubItem>
+    {
+    public:
+        ColorFlyoutSubItem();
+
+        ColorFlyoutSubItem(std::shared_ptr<ScopedResourceLoader> resourceLoader);
+        void Create();
+
+    private:
+        std::shared_ptr<ScopedResourceLoader> _resourceLoader{ nullptr };
+    };
+}
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    struct ColorFlyoutSubItem : ColorFlyoutSubItemT<ColorFlyoutSubItem, implementation::ColorFlyoutSubItem>
+    {
+    };
+}

src/cascadia/TerminalApp/ColorFlyoutSubItem.idl

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+import "..\App.idl";
+
+//namespace TerminalApp
+//{
+//    [default_interface] runtimeclass ColorFlyoutSubItem : Windows.UI.Xaml.Controls.MenuFlyoutSubItem
+//    {
+//        ColorFlyoutSubItem();
+//    }
+//}

src/cascadia/TerminalApp/ColorFlyoutSubItem.xaml

@@ -0,0 +1,13 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+the MIT License. See LICENSE in the project root for license information. -->
+<Grid
+    x:Class="TerminalApp.ColorFlyoutSubItem"
+    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">
+
+</Grid>

src/cascadia/TerminalApp/ColorPickupFlyout.cpp

@@ -0,0 +1,109 @@
+#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([this](const auto&, const Windows::UI::Xaml::Controls::ColorChangedEventArgs& args) {
+            _colorSelected(args.NewColor());
+        });
+    }
+
+    // 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();
+    }
+
+    DEFINE_EVENT(ColorPickupFlyout, ColorSelected, _colorSelected, TerminalApp::ColorSelectedArgs);
+    DEFINE_EVENT(ColorPickupFlyout, ColorCleared, _colorCleared, TerminalApp::ColorClearedArgs);
+}

src/cascadia/TerminalApp/ColorPickupFlyout.h

@@ -0,0 +1,26 @@
+#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);
+    };
+}
+
+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;
+    }
+}