diff --git a/Flow.Launcher/Resources/MarkupExtensions/CollapsedWhenExtension.cs b/Flow.Launcher/Resources/MarkupExtensions/CollapsedWhenExtension.cs index 48022df48..3513123c8 100644 --- a/Flow.Launcher/Resources/MarkupExtensions/CollapsedWhenExtension.cs +++ b/Flow.Launcher/Resources/MarkupExtensions/CollapsedWhenExtension.cs @@ -21,16 +21,6 @@ public class CollapsedWhenExtension : MarkupExtension { set => IsEqualTo = value; } - public string? IsEqualToString - { - get => IsEqualTo switch - { - string s => s, - _ => null - }; - set => IsEqualTo = value; - } - public int? IsEqualToInt { get => IsEqualTo switch @@ -40,6 +30,7 @@ public class CollapsedWhenExtension : MarkupExtension { }; set => IsEqualTo = value; } + protected virtual Visibility DefaultVisibility => Visibility.Visible; protected virtual Visibility InvertedVisibility => Visibility.Collapsed; diff --git a/Flow.Launcher/Resources/MarkupExtensions/HideableVisibilityConverter.cs b/Flow.Launcher/Resources/MarkupExtensions/HideableVisibilityConverter.cs index 877182e9b..e7d1fc6ea 100644 --- a/Flow.Launcher/Resources/MarkupExtensions/HideableVisibilityConverter.cs +++ b/Flow.Launcher/Resources/MarkupExtensions/HideableVisibilityConverter.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.Globalization; using System.Windows; using System.Windows.Data; @@ -26,14 +25,11 @@ public class HideableVisibilityConverter : IMultiValueConverter, IValueConverter value2 = System.Convert.ToInt32(enum2); } - Debug.WriteLine($"HideableConverter: {value1} == {value2}"); - return Equals(value1, value2) ? InvertedVisibility : DefaultVisibility; } public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { - Debug.WriteLine($"HideableConverter: {value} ({value?.GetType()}) == {IsEqualTo} ({IsEqualTo?.GetType()})"); return Equals(value, IsEqualTo) ? InvertedVisibility : DefaultVisibility; }