Skip to content

Commit 6751942

Browse files
committed
Use Binding instead of RelativeResource for code quality
1 parent b097aa0 commit 6751942

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
MaxWidth="96"
2525
MaxHeight="96"
2626
Margin="5 12 8 0"
27-
Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
27+
Source="{Binding PreviewImage, IsAsync=True, Mode=OneWay}" />
2828
<Grid Grid.Row="1">
2929
<TextBlock
3030
Margin="5 6 5 16"
3131
HorizontalAlignment="Stretch"
3232
VerticalAlignment="Top"
3333
Style="{DynamicResource PreviewItemTitleStyle}"
34-
Text="{Binding FileName}"
34+
Text="{Binding FileName, Mode=OneTime}"
3535
TextAlignment="Center"
3636
TextWrapping="Wrap" />
3737
</Grid>
@@ -47,7 +47,7 @@
4747
<TextBlock
4848
Margin="5 8 8 8"
4949
Style="{DynamicResource PreviewItemSubTitleStyle}"
50-
Text="{Binding FilePath}" />
50+
Text="{Binding FilePath, Mode=OneTime}" />
5151
<Rectangle
5252
Width="Auto"
5353
Height="1"
@@ -60,17 +60,17 @@
6060
<Style.Triggers>
6161
<MultiDataTrigger>
6262
<MultiDataTrigger.Conditions>
63-
<Condition Binding="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Value="Collapsed" />
64-
<Condition Binding="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Value="Collapsed" />
65-
<Condition Binding="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Value="Collapsed" />
63+
<Condition Binding="{Binding FileSizeVisibility}" Value="Collapsed" />
64+
<Condition Binding="{Binding CreatedAtVisibility}" Value="Collapsed" />
65+
<Condition Binding="{Binding LastModifiedAtVisibility}" Value="Collapsed" />
6666
</MultiDataTrigger.Conditions>
6767
<Setter Property="Visibility" Value="Collapsed" />
6868
</MultiDataTrigger>
6969
</Style.Triggers>
7070
</Style>
7171
</Rectangle.Style>
7272
</Rectangle>
73-
<Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
73+
<Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, Mode=OneTime}">
7474
<Grid.ColumnDefinitions>
7575
<ColumnDefinition Width="100" />
7676
<ColumnDefinition Width="*" />
@@ -88,17 +88,17 @@
8888
Style="{DynamicResource PreviewItemSubTitleStyle}"
8989
Text="{DynamicResource FileSize}"
9090
TextWrapping="Wrap"
91-
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
91+
Visibility="{Binding FileSizeVisibility, Mode=OneTime}" />
9292
<TextBlock
9393
Grid.Row="0"
9494
Grid.Column="1"
9595
Margin="0 0 13 0"
9696
HorizontalAlignment="Right"
9797
VerticalAlignment="Top"
9898
Style="{DynamicResource PreviewItemSubTitleStyle}"
99-
Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
99+
Text="{Binding FileSize, Mode=OneWay}"
100100
TextWrapping="Wrap"
101-
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
101+
Visibility="{Binding FileSizeVisibility, Mode=OneTime}" />
102102

103103
<TextBlock
104104
Grid.Row="1"
@@ -108,17 +108,17 @@
108108
Style="{DynamicResource PreviewItemSubTitleStyle}"
109109
Text="{DynamicResource Created}"
110110
TextWrapping="Wrap"
111-
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
111+
Visibility="{Binding CreatedAtVisibility, Mode=OneTime}" />
112112
<TextBlock
113113
Grid.Row="1"
114114
Grid.Column="1"
115115
Margin="0 0 13 0"
116116
HorizontalAlignment="Right"
117117
VerticalAlignment="Top"
118118
Style="{DynamicResource PreviewItemSubTitleStyle}"
119-
Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
119+
Text="{Binding CreatedAt, Mode=OneWay}"
120120
TextWrapping="Wrap"
121-
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
121+
Visibility="{Binding CreatedAtVisibility, Mode=OneTime}" />
122122

123123
<TextBlock
124124
Grid.Row="2"
@@ -128,17 +128,17 @@
128128
Style="{DynamicResource PreviewItemSubTitleStyle}"
129129
Text="{DynamicResource LastModified}"
130130
TextWrapping="Wrap"
131-
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
131+
Visibility="{Binding LastModifiedAtVisibility, Mode=OneTime}" />
132132
<TextBlock
133133
Grid.Row="2"
134134
Grid.Column="1"
135135
Margin="0 0 13 0"
136136
HorizontalAlignment="Right"
137137
VerticalAlignment="Top"
138138
Style="{DynamicResource PreviewItemSubTitleStyle}"
139-
Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
139+
Text="{Binding LastModifiedAt, Mode=OneWay}"
140140
TextWrapping="Wrap"
141-
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
141+
Visibility="{Binding LastModifiedAtVisibility, Mode=OneTime}" />
142142
</Grid>
143143
</StackPanel>
144144
</Grid>

Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@ public partial class PreviewPanel : UserControl
2323

2424
public string FilePath { get; }
2525
public string FileName { get; }
26-
public string FileSize { get; private set; } = Main.Context.API.GetTranslation("plugin_explorer_plugin_tooltip_more_info_unknown");
27-
public string CreatedAt { get; } = "";
28-
public string LastModifiedAt { get; } = "";
26+
27+
[ObservableProperty]
28+
private string _fileSize = Main.Context.API.GetTranslation("plugin_explorer_plugin_tooltip_more_info_unknown");
29+
30+
[ObservableProperty]
31+
private string _createdAt = "";
32+
33+
[ObservableProperty]
34+
private string _lastModifiedAt = "";
35+
36+
[ObservableProperty]
2937
private ImageSource _previewImage = new BitmapImage();
30-
private Settings Settings { get; }
3138

32-
public ImageSource PreviewImage
33-
{
34-
get => _previewImage;
35-
private set
36-
{
37-
_previewImage = value;
38-
OnPropertyChanged();
39-
}
40-
}
39+
private Settings Settings { get; }
4140

4241
public Visibility FileSizeVisibility => Settings.ShowFileSizeInPreviewPanel
4342
? Visibility.Visible

0 commit comments

Comments
 (0)