Skip to content

Commit 61d3758

Browse files
committed
Remove CollapsedWhen/VisibleWhen extension constructors with two arguments, forcing the user to explicitly specify IsEqualTo for clarity
1 parent 88e7000 commit 61d3758

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

Flow.Launcher/Resources/MarkupExtensions/CollapsedWhenExtension.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ public CollapsedWhenExtension(Binding when)
3939
When = when;
4040
}
4141

42-
public CollapsedWhenExtension(Binding when, object? isEqualTo)
43-
{
44-
When = when;
45-
IsEqualTo = isEqualTo;
46-
}
47-
4842
public override object ProvideValue(IServiceProvider serviceProvider) {
4943
if (serviceProvider.GetService(typeof(IProvideValueTarget)) is not IProvideValueTarget provideValueTarget)
5044
return DependencyProperty.UnsetValue;

Flow.Launcher/Resources/MarkupExtensions/VisibleWhenExtension.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ public class VisibleWhenExtension : CollapsedWhenExtension
1111
protected override Visibility InvertedVisibility => Visibility.Visible;
1212

1313
public VisibleWhenExtension(Binding when) : base(when) { }
14-
15-
public VisibleWhenExtension(Binding when, object? isEqualTo) : base(when, isEqualTo) { }
1614
}

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
SelectedValue="{Binding Settings.CustomScreenNumber}"
6666
Visibility="{ext:VisibleWhen
6767
{Binding Settings.SearchWindowScreen},
68-
{x:Static userSettings:SearchWindowScreens.Custom}}"
68+
IsEqualTo={x:Static userSettings:SearchWindowScreens.Custom}}"
6969
/>
7070
</StackPanel>
7171
</cc:Card>
@@ -75,7 +75,7 @@
7575
Title="{DynamicResource SearchWindowAlign}"
7676
Visibility="{ext:CollapsedWhen
7777
{Binding Settings.SearchWindowScreen},
78-
{x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
78+
IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
7979
<StackPanel Orientation="Horizontal">
8080
<ComboBox
8181
MinWidth="160"
@@ -92,7 +92,7 @@
9292
VerticalAlignment="Center"
9393
Visibility="{ext:VisibleWhen
9494
{Binding Settings.SearchWindowAlign},
95-
{x:Static userSettings:SearchWindowAligns.Custom}}">
95+
IsEqualTo={x:Static userSettings:SearchWindowAligns.Custom}}">
9696
<TextBox VerticalAlignment="Center" MinWidth="80"
9797
Text="{Binding Settings.CustomWindowLeft}" />
9898
<TextBlock VerticalAlignment="Center" Margin="10" Text="x" />

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
TextWrapping="NoWrap"
426426
Visibility="{ext:VisibleWhen
427427
{Binding Settings.AnimationSpeed},
428-
{x:Static userSettings:AnimationSpeeds.Custom}}" />
428+
IsEqualTo={x:Static userSettings:AnimationSpeeds.Custom}}" />
429429
</StackPanel>
430430
</cc:Card>
431431
</cc:CardGroup>

0 commit comments

Comments
 (0)