From fa25dfbf7ab0fac00fc0dbf953ae9d4c5000258a Mon Sep 17 00:00:00 2001 From: dansmor7 <101892345+dansmor7@users.noreply.github.com> Date: Thu, 21 Apr 2022 15:34:55 -0700 Subject: [PATCH] Misc visual fixes (#12916) Fixed various small issues: * Made TabView bottom border span the entire window width * Made ScrollBar inner thumb rounded again * Made SplitButton look more like the new add tab button * Adjusted rename box height (24px, like the official compact sizing height) * Adjusted caption button colors to match Windows 11 * ColorPicker can now escape window bounds * Tweaked ColorPicker buttons --- src/cascadia/TerminalApp/App.xaml | 2 +- .../TerminalApp/ColorPickupFlyout.cpp | 3 +- .../TerminalApp/ColorPickupFlyout.xaml | 224 ++++++++++-------- .../TerminalApp/MinMaxCloseControl.xaml | 30 ++- .../TerminalApp/TabHeaderControl.xaml | 20 +- src/cascadia/TerminalApp/TabRowControl.xaml | 166 +++++++------ src/cascadia/TerminalApp/TerminalPage.xaml | 3 + src/cascadia/TerminalApp/TitlebarControl.xaml | 7 + src/cascadia/TerminalControl/TermControl.xaml | 7 +- 9 files changed, 242 insertions(+), 220 deletions(-) diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml index 1ddf3e82b0..eb9e6b6b7f 100644 --- a/src/cascadia/TerminalApp/App.xaml +++ b/src/cascadia/TerminalApp/App.xaml @@ -46,7 +46,7 @@ Color="{ThemeResource SystemErrorTextColor}" /> - 9,0,8,0 + 9,0,5,0 12 diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp index 3f83899467..a12160afb2 100644 --- a/src/cascadia/TerminalApp/ColorPickupFlyout.cpp +++ b/src/cascadia/TerminalApp/ColorPickupFlyout.cpp @@ -34,8 +34,7 @@ namespace winrt::TerminalApp::implementation void ColorPickupFlyout::ColorButton_Click(IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const&) { auto button{ sender.as() }; - auto rectangle{ button.Content().as() }; - auto rectClr{ rectangle.Fill().as() }; + auto rectClr{ button.Background().as() }; _ColorSelectedHandlers(rectClr.Color()); Hide(); } diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml index b7da875af4..26fbb107c5 100644 --- a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml +++ b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml @@ -5,6 +5,8 @@ xmlns:local="using:TerminalApp" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" + Placement="Bottom" + ShouldConstrainToRootBounds="False" mc:Ignorable="d"> - +