From 8b02fcf40484d6cdb0ea0c4f1094fb942c065bb0 Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Wed, 6 Apr 2022 06:16:34 -0500 Subject: [PATCH] Replace `RadioButton` expanders with `ComboBox`es (#12833) Replaces all the `RadioButton` expanders with `ComboBox`es, which can have the options inline, as opposed to in the expander content. For example, here's a single commit with the changes for a single one of these settings: https://github.com/microsoft/terminal/commit/745c77d03e402a35901bfc5516486e315b0f673f ### Checklist * [x] Closes #12648 * [x] Actually closes #9566 as well (by just removing all radio buttons) * [x] I work here * [x] Tested manually * [x] I'd love @carlos-zamora to have an a11y pass at this, just to see if it's egregious or not. ### Before, after: ![image](https://user-images.githubusercontent.com/18356694/161822068-939ff875-00ff-454a-8b58-cb843ba801f4.png) (cherry picked from commit 9e03800438df42b4e89716aaabbed842926b136a) Service-Card-Id: 81744877 Service-Version: 1.13 --- .../TerminalSettingsEditor/Appearances.xaml | 43 ++++++++----------- .../GlobalAppearance.xaml | 28 ++++++------ .../TerminalSettingsEditor/Interaction.xaml | 28 ++++++------ .../TerminalSettingsEditor/Launch.xaml | 42 +++++++++--------- .../Profiles_Advanced.xaml | 28 ++++++------ .../Profiles_Appearance.xaml | 16 +++---- 6 files changed, 90 insertions(+), 95 deletions(-) diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml index 606cfa82698..9feeb203281 100644 --- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml +++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml @@ -19,12 +19,7 @@ - - - - - @@ -118,7 +113,7 @@ @@ -176,12 +171,12 @@ - + SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}"> + @@ -245,12 +240,12 @@ ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}" HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}" SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}" - Style="{StaticResource ExpanderSettingContainerStyle}" Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}"> - + @@ -472,12 +467,12 @@ - + SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}"> + diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml index 2a0bdbcb98a..2d15f1c2103 100644 --- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml +++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml @@ -17,9 +17,9 @@ - - + @@ -40,12 +40,12 @@ - - + + @@ -79,12 +79,12 @@ - - + + diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml index 8c0e7a08060..57f54132c46 100644 --- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml +++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml @@ -17,9 +17,9 @@ - - + @@ -33,12 +33,12 @@ - - + + @@ -69,12 +69,12 @@ - - + + diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml index 308ce6a10ab..fe0f5607f9e 100644 --- a/src/cascadia/TerminalSettingsEditor/Launch.xaml +++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml @@ -18,9 +18,9 @@ - - +