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">
-
+
+
+ Background="Crimson"
+ Click="ColorButton_Click" />
+ Background="SteelBlue"
+ Click="ColorButton_Click" />
+ Background="MediumSeaGreen"
+ Click="ColorButton_Click" />
+ Background="DarkOrange"
+ Click="ColorButton_Click" />
+ Background="MediumVioletRed"
+ Click="ColorButton_Click" />
+ Background="DodgerBlue"
+ Click="ColorButton_Click" />
+ Background="LimeGreen"
+ Click="ColorButton_Click" />
+ Background="Yellow"
+ Click="ColorButton_Click" />
+ Background="BlueViolet"
+ Click="ColorButton_Click" />
+ Background="SlateBlue"
+ Click="ColorButton_Click" />
+ Background="Lime"
+ Click="ColorButton_Click" />
+ Background="Tan"
+ Click="ColorButton_Click" />
+ Background="Magenta"
+ Click="ColorButton_Click" />
+ Background="Cyan"
+ Click="ColorButton_Click" />
+ Background="SkyBlue"
+ Click="ColorButton_Click" />
+ Background="DarkGray"
+ Click="ColorButton_Click" />
-
-
-
-
-
+
-
+
-
-
-
-
-
+
-
+
diff --git a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
index cbfe7d9928..fe244a6893 100644
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
@@ -19,11 +19,12 @@
+ #C42B1C
1.0
+ ResourceKey="SubtleFillColorSecondary" />
+ ResourceKey="SubtleFillColorTertiary" />
Transparent
+ Color="{ThemeResource CloseButtonColor}" />
+ Opacity="0.9"
+ Color="{ThemeResource CloseButtonColor}" />
+ Opacity="0.7"
+ Color="White" />
#00e81123
+ #C42B1C
1.0
+ ResourceKey="SubtleFillColorSecondary" />
+ ResourceKey="SubtleFillColorTertiary" />
Transparent
+ Color="{ThemeResource CloseButtonColor}" />
+ Opacity="0.9"
+ Color="{ThemeResource CloseButtonColor}" />
+ Opacity="0.7"
+ Color="White" />
#00e81123
- 3.0
+ 2.0
+ Duration="0:0:0.15" />
-
-
-
-
- 0,0,0,1
-
-
- 0,0,0,1
-
-
- 0,0,0,1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 31
+ 31
+
+
+
+
diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index 9270e383d5..0bb4a482e0 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -28,6 +28,7 @@
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+
+
diff --git a/src/cascadia/TerminalControl/TermControl.xaml b/src/cascadia/TerminalControl/TermControl.xaml
index 589f9d4c3f..94afdb9c43 100644
--- a/src/cascadia/TerminalControl/TermControl.xaml
+++ b/src/cascadia/TerminalControl/TermControl.xaml
@@ -56,6 +56,7 @@
16
0
+ 3