d0d3cc6a75
The flyout wasn't very polished, so I did some adjustments. It's all visual changes, functionality should be the same. * made the flyout use OverlayCornerRadius and 16px padding (to match WinUI 2.6) * changed ColorPicker to muxc:ColorPicker for new styles (the color schemes picker too) * changed "Custom" Button into a ToggleButton * no longer needs ellipsis - localization files should be updated * OK button was moved to the right and uses accent color * adjusted margins and padding * tweaked the color boxes to _look_ like the ones in color schemes   ## Validation Steps Performed * Color picker in settings UI still works ✔️ * Color picker for tabs still works ✔️
104 lines
4.1 KiB
C++
104 lines
4.1 KiB
C++
#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();
|
|
|
|
OkButton().Content(winrt::box_value(RS_(L"Ok")));
|
|
CustomColorButton().Content(winrt::box_value(RS_(L"TabColorCustomButton/Content")));
|
|
ClearColorButton().Content(winrt::box_value(RS_(L"TabColorClearButton/Content")));
|
|
}
|
|
|
|
// 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 button{ sender.as<Windows::UI::Xaml::Controls::Button>() };
|
|
auto rectangle{ button.Content().as<Windows::UI::Xaml::Shapes::Rectangle>() };
|
|
auto rectClr{ rectangle.Fill().as<Windows::UI::Xaml::Media::SolidColorBrush>() };
|
|
_ColorSelectedHandlers(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&)
|
|
{
|
|
_ColorClearedHandlers();
|
|
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();
|
|
_ColorSelectedHandlers(color);
|
|
Hide();
|
|
}
|
|
|
|
void ColorPickupFlyout::ColorPicker_ColorChanged(const Microsoft::UI::Xaml::Controls::ColorPicker&, const Microsoft::UI::Xaml::Controls::ColorChangedEventArgs& args)
|
|
{
|
|
_ColorSelectedHandlers(args.NewColor());
|
|
}
|
|
}
|