From 9f40db1f906e24c493d5101da0b44b7da0517d73 Mon Sep 17 00:00:00 2001
From: Ian O'Neill <ianjoneill@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:42:04 +0100
Subject: [PATCH] Ensure the background image path is displayed in the settings
 UI

---
 .../TerminalSettingsEditor/Appearances.xaml        |  2 +-
 src/cascadia/TerminalSettingsEditor/Converters.cpp | 14 +++++++++++---
 src/cascadia/TerminalSettingsEditor/Converters.h   |  2 +-
 src/cascadia/TerminalSettingsEditor/Converters.idl |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index c1f3253766c..497b7349a2a 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -220,7 +220,7 @@
                         <TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
                                  IsSpellCheckEnabled="False"
                                  Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind local:Converters.StringFallBackToEmptyString('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
+                                 Text="{x:Bind local:Converters.StringOrEmptyIfPlaceholder('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
                         <Button x:Uid="Profile_BackgroundImageBrowse"
                                 Click="BackgroundImage_Click"
                                 IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Converters.cpp b/src/cascadia/TerminalSettingsEditor/Converters.cpp
index d9cff642ed7..20e3fe0ec27 100644
--- a/src/cascadia/TerminalSettingsEditor/Converters.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Converters.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "Converters.h"
 #if __has_include("Converters.g.cpp")
 #include "Converters.g.cpp"
@@ -99,8 +99,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         return value.empty() ? winrt::Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible;
     }
-    winrt::hstring Converters::StringFallBackToEmptyString(winrt::hstring expected, winrt::hstring actual)
+
+    // Method Description:
+    // - Returns the value string, unless it matches the placeholder in which case the empty string.
+    // Arguments:
+    // - placeholder - the placeholder string.
+    // - value - the value string.
+    // Return Value:
+    // - The value string, unless it matches the placeholder in which case the empty string.
+    winrt::hstring Converters::StringOrEmptyIfPlaceholder(winrt::hstring placeholder, winrt::hstring value)
     {
-        return expected == actual ? expected : L"";
+        return placeholder == value ? L"" : value;
     }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/Converters.h b/src/cascadia/TerminalSettingsEditor/Converters.h
index d7f99cbf2d6..2bde550e839 100644
--- a/src/cascadia/TerminalSettingsEditor/Converters.h
+++ b/src/cascadia/TerminalSettingsEditor/Converters.h
@@ -21,7 +21,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         static double PercentageValueToPercentage(double value);
         static bool StringsAreNotEqual(winrt::hstring expected, winrt::hstring actual);
         static winrt::Windows::UI::Xaml::Visibility StringNotEmptyToVisibility(winrt::hstring value);
-        static winrt::hstring StringFallBackToEmptyString(winrt::hstring expected, winrt::hstring actual);
+        static winrt::hstring StringOrEmptyIfPlaceholder(winrt::hstring placeholder, winrt::hstring value);
     };
 }
 
diff --git a/src/cascadia/TerminalSettingsEditor/Converters.idl b/src/cascadia/TerminalSettingsEditor/Converters.idl
index a5b79d5fce0..3429bef4079 100644
--- a/src/cascadia/TerminalSettingsEditor/Converters.idl
+++ b/src/cascadia/TerminalSettingsEditor/Converters.idl
@@ -20,6 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor
         static Double PercentageValueToPercentage(Double value);
         static Boolean StringsAreNotEqual(String expected, String actual);
         static Windows.UI.Xaml.Visibility StringNotEmptyToVisibility(String value);
-        static String StringFallBackToEmptyString(String expected, String actual);
+        static String StringOrEmptyIfPlaceholder(String placeholder, String value);
     }
 }