[settings-editor] Switch to function bindings instead of Converter ob…

…jects (#10846) ## Validation Steps Performed Clicked around, validated that settings still behave the same (as far as I can tell with my limited terminal configuration expertise) Closes #10387
microsoft · Aug 3, 2021 · 8ab3422 · 8ab3422
1 parent cccaab8
commit 8ab3422
Show file tree

Hide file tree

Showing 37 changed files with 233 additions and 727 deletions.
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.xaml b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -158,7 +158,6 @@
 
             <!--  Converters & Misc.  -->
             <model:IconPathConverter x:Key="IconSourceConverter" />
-            <local:InvertedBooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" />
             <SolidColorBrush x:Key="ActionContainerBackgroundEditing"
                              Color="{ThemeResource SystemListMediumColor}" />
             <SolidColorBrush x:Key="ActionContainerBackground"
@@ -195,7 +194,7 @@
                         <TextBlock Grid.Column="0"
                                    Style="{StaticResource KeyBindingNameTextBlockStyle}"
                                    Text="{x:Bind Name, Mode=OneWay}"
-                                   Visibility="{x:Bind IsInEditMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}" />
+                                   Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}" />
 
                         <!--  Edit Mode: Action Combo-box  -->
                         <ComboBox x:Uid="Actions_ActionComboBox"
@@ -211,7 +210,7 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Style="{ThemeResource KeyChordBorderStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
+                                Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
 
                             <TextBlock FontSize="14"
                                        Style="{ThemeResource KeyChordTextBlockStyle}"
@@ -303,7 +302,7 @@
                                     Margin="8,0,0,0"
                                     AutomationProperties.Name="{x:Bind DeleteButtonName}"
                                     Style="{StaticResource EditButtonStyle}"
-                                    Visibility="{x:Bind IsNewlyAdded, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
+                                    Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(IsNewlyAdded), Mode=OneWay}">
                                 <Button.Content>
                                     <FontIcon FontSize="{StaticResource EditButtonIconSize}"
                                               Glyph="&#xE74D;" />

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.h b/src/cascadia/TerminalSettingsEditor/Appearances.h
@@ -51,6 +51,19 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     public:
         AppearanceViewModel(const Model::AppearanceConfig& appearance);
 
+        void SetFontWeightFromDouble(double fontWeight)
+        {
+            FontWeight(winrt::Microsoft::Terminal::Settings::Editor::Converters::DoubleToFontWeight(fontWeight));
+        }
+        void SetBackgroundImageOpacityFromPercentageValue(double percentageValue)
+        {
+            BackgroundImageOpacity(winrt::Microsoft::Terminal::Settings::Editor::Converters::PercentageValueToPercentage(percentageValue));
+        }
+        void SetBackgroundImagePath(winrt::hstring path)
+        {
+            BackgroundImagePath(path);
+        }
+
         // background image
         bool UseDesktopBGImage();
         void UseDesktopBGImage(const bool useDesktop);

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.idl b/src/cascadia/TerminalSettingsEditor/Appearances.idl
@@ -23,6 +23,10 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         Boolean IsDefault;
 
+        void SetFontWeightFromDouble(Double fontWeight);
+        void SetBackgroundImageOpacityFromPercentageValue(Double percentageValue);
+        void SetBackgroundImagePath(String path);
+
         Boolean UseDesktopBGImage;
         Boolean BackgroundImageSettingsVisible { get; };
 
@@ -68,5 +72,6 @@ namespace Microsoft.Terminal.Settings.Editor
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> FontWeightList { get; };
 
         IInspectable CurrentFontFace { get; };
+        Windows.UI.Xaml.Controls.Slider BIOpacitySlider { get; };
     }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -34,16 +34,6 @@
                 <TextBlock FontFamily="{x:Bind Name}"
                            Text="{x:Bind LocalizedName}" />
             </DataTemplate>
-
-            <local:ColorToBrushConverter x:Key="ColorToBrushConverter" />
-            <local:PercentageConverter x:Key="PercentageConverter" />
-            <local:PercentageSignConverter x:Key="PercentageSignConverter" />
-            <local:FontWeightConverter x:Key="FontWeightConverter" />
-            <local:InvertedBooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" />
-            <local:StringIsEmptyConverter x:Key="StringIsEmptyConverter" />
-            <local:PaddingConverter x:Key="PaddingConverter" />
-            <local:StringIsNotDesktopConverter x:Key="StringIsNotDesktopConverter" />
-            <local:DesktopWallpaperToEmptyStringConverter x:Key="DesktopWallpaperToEmptyStringConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -87,7 +77,7 @@
                               SelectedItem="{x:Bind CurrentFontFace, Mode=OneWay}"
                               SelectionChanged="FontFace_SelectionChanged"
                               Style="{StaticResource ComboBoxSettingStyle}"
-                              Visibility="{x:Bind ShowAllFonts, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}" />
+                              Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(ShowAllFonts), Mode=OneWay}" />
                     <ComboBox ItemTemplate="{StaticResource FontFaceComboBoxItemTemplate}"
                               ItemsSource="{x:Bind SourceProfile.CompleteFontList, Mode=OneWay}"
                               SelectedItem="{x:Bind CurrentFontFace, Mode=OneWay}"
@@ -144,7 +134,7 @@
                                 Minimum="0"
                                 TickFrequency="50"
                                 TickPlacement="Outside"
-                                Value="{x:Bind Appearance.FontWeight, Converter={StaticResource FontWeightConverter}, Mode=TwoWay}" />
+                                Value="{x:Bind local:Converters.FontWeightToDouble(Appearance.FontWeight), BindBack=Appearance.SetFontWeightFromDouble, Mode=TwoWay}" />
                         <TextBlock Grid.Column="1"
                                    Margin="10,0,0,0"
                                    Style="{StaticResource SliderValueLabelStyle}"
@@ -215,12 +205,12 @@
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImagePathOverrideSource, Mode=OneWay}">
                 <StackPanel Orientation="Vertical">
                     <StackPanel Orientation="Horizontal">
-                        <TextBox IsEnabled="{x:Bind Appearance.BackgroundImagePath, Mode=OneWay, Converter={StaticResource StringIsNotDesktopConverter}}"
+                        <TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
                                  Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Appearance.BackgroundImagePath, Mode=TwoWay, Converter={StaticResource DesktopWallpaperToEmptyStringConverter}}" />
+                                 Text="{x:Bind local:Converters.StringFallBackToEmptyString('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
                         <Button x:Uid="Profile_BackgroundImageBrowse"
                                 Click="BackgroundImage_Click"
-                                IsEnabled="{x:Bind Appearance.BackgroundImagePath, Mode=OneWay, Converter={StaticResource StringIsNotDesktopConverter}}"
+                                IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
                                 Style="{StaticResource BrowseButtonStyle}" />
                     </StackPanel>
                     <CheckBox x:Name="UseDesktopImageCheckBox"
@@ -431,10 +421,10 @@
                     </Grid.ColumnDefinitions>
                     <Slider x:Name="BIOpacitySlider"
                             Grid.Column="0"
-                            Value="{x:Bind Appearance.BackgroundImageOpacity, Converter={StaticResource PercentageConverter}, Mode=TwoWay}" />
+                            Value="{x:Bind local:Converters.PercentageToPercentageValue(Appearance.BackgroundImageOpacity), BindBack=Appearance.SetBackgroundImageOpacityFromPercentageValue, Mode=TwoWay}" />
                     <TextBlock Grid.Column="1"
                                Style="{StaticResource SliderValueLabelStyle}"
-                               Text="{Binding ElementName=BIOpacitySlider, Path=Value, Mode=OneWay, Converter={StaticResource PercentageSignConverter}}" />
+                               Text="{x:Bind local:Converters.AppendPercentageSign(BIOpacitySlider.Value), Mode=OneWay}" />
                 </Grid>
             </local:SettingContainer>
         </StackPanel>

diff --git a/src/cascadia/TerminalSettingsEditor/ColorLightenConverter.cpp b/src/cascadia/TerminalSettingsEditor/ColorLightenConverter.cpp
diff --git a/src/cascadia/TerminalSettingsEditor/ColorLightenConverter.h b/src/cascadia/TerminalSettingsEditor/ColorLightenConverter.h
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
@@ -60,7 +60,7 @@
             <DataTemplate x:Key="ColorTableEntryTemplate"
                           x:DataType="local:ColorTableEntry">
                 <Button AutomationProperties.Name="{x:Bind Name}"
-                        Background="{x:Bind Color, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}"
+                        Background="{x:Bind local:Converters.ColorToBrush(Color), Mode=OneWay}"
                         Style="{StaticResource ColorButtonStyle}"
                         ToolTipService.ToolTip="{x:Bind Name}">
                     <Button.Resources>
@@ -69,11 +69,11 @@
                             <ResourceDictionary.ThemeDictionaries>
                                 <ResourceDictionary x:Key="Light">
                                     <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                     Color="{x:Bind Color, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}" />
+                                                     Color="{x:Bind local:Converters.LightenColor(Color), Mode=OneWay}" />
                                 </ResourceDictionary>
                                 <ResourceDictionary x:Key="Dark">
                                     <SolidColorBrush x:Key="ButtonBackgroundPointerOver"
-                                                     Color="{x:Bind Color, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}" />
+                                                     Color="{x:Bind local:Converters.LightenColor(Color), Mode=OneWay}" />
                                 </ResourceDictionary>
                                 <!--  No High contrast dictionary, let's just leave that unchanged.  -->
                             </ResourceDictionary.ThemeDictionaries>
@@ -90,11 +90,6 @@
                 </Button>
             </DataTemplate>
 
-            <local:ColorToBrushConverter x:Key="ColorToBrushConverter" />
-            <local:ColorToHexConverter x:Key="ColorToHexConverter" />
-            <local:InvertedBooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" />
-            <local:ColorLightenConverter x:Key="ColorLightenConverter" />
-
         </ResourceDictionary>
     </Page.Resources>
 
@@ -106,7 +101,7 @@
             <StackPanel Orientation="Horizontal">
 
                 <StackPanel Orientation="Horizontal"
-                            Visibility="{x:Bind IsRenaming, Converter={StaticResource InvertedBooleanToVisibilityConverter}, Mode=OneWay}">
+                            Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(IsRenaming), Mode=OneWay}">
                     <!--  Select a color scheme  -->
                     <ComboBox x:Name="ColorSchemeComboBox"
                               ItemsSource="{x:Bind ColorSchemeList, Mode=OneWay}"

diff --git a/src/cascadia/TerminalSettingsEditor/ColorToBrushConverter.cpp b/src/cascadia/TerminalSettingsEditor/ColorToBrushConverter.cpp
diff --git a/src/cascadia/TerminalSettingsEditor/ColorToBrushConverter.h b/src/cascadia/TerminalSettingsEditor/ColorToBrushConverter.h
diff --git a/src/cascadia/TerminalSettingsEditor/ColorToHexConverter.cpp b/src/cascadia/TerminalSettingsEditor/ColorToHexConverter.cpp
diff --git a/src/cascadia/TerminalSettingsEditor/ColorToHexConverter.h b/src/cascadia/TerminalSettingsEditor/ColorToHexConverter.h