From da2cf8c3f667dfa1d1e25d1be083da6b0c47a83e Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Wed, 9 Mar 2022 17:52:07 -0600 Subject: [PATCH] Make the Scrollbar 16dips again (#12608) BODGY: Controlsv2 changed the size of the scrollbars from 16dips to 12dips. This is harder for folks to hit with the mouse, and isn't consistent with the rest of the scrollbars on the platform (as much as they can be). To work around this, we have to entirely copy the template for the ScrollBar into our XAML file. We're then also re-defining ScrollBarSize here to 16, so that the new template will pick up on the new value. This is kinda a pain, and we have to be careful to be sure to ingest an updated version of the template any time we update MUX. The latest Controlsv2 version of the template can be found at: https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/CommonStyles/ScrollBar_themeresources.xaml#L218 We're also planning on making this adjustable in the future (GH#9218), where we might need this anyways. ##### after, before: ![image](https://user-images.githubusercontent.com/18356694/156254464-1a9080f6-51ce-4619-b002-2a3c607cdf5f.png) ##### after overlayed on top of before ![image](https://user-images.githubusercontent.com/18356694/156254546-fccc3cee-12a3-4e1a-8fd7-7470f1ec93ad.png) ##### comparison ![image](https://user-images.githubusercontent.com/18356694/156257934-ec4ac840-c8ca-4fca-a848-08a32b1c55c3.png) * reported originally in #12395 * upstream: https://github.com/microsoft/microsoft-ui-xaml/issues/6684 * closes an element of #12400 --- .github/actions/spelling/allow/allow.txt | 4 + src/cascadia/TerminalControl/TermControl.xaml | 1141 +++++++++++++++++ 2 files changed, 1145 insertions(+) diff --git a/.github/actions/spelling/allow/allow.txt b/.github/actions/spelling/allow/allow.txt index 50d9b75bc70..37a5b7d0f28 100644 --- a/.github/actions/spelling/allow/allow.txt +++ b/.github/actions/spelling/allow/allow.txt @@ -21,6 +21,8 @@ downside downsides dze dzhe +EDDB +EDDC Enum'd Fitt formattings @@ -74,6 +76,8 @@ runtimes shcha slnt Sos +timeline +timelines timestamped TLDR tokenizes diff --git a/src/cascadia/TerminalControl/TermControl.xaml b/src/cascadia/TerminalControl/TermControl.xaml index 663ccf7ce1a..589f9d4c3f7 100644 --- a/src/cascadia/TerminalControl/TermControl.xaml +++ b/src/cascadia/TerminalControl/TermControl.xaml @@ -5,6 +5,8 @@ + + + + + 16 + 0 + + + +