Skip to content

Commit 7ca6661

Browse files
committed
Default Preview: Remove subtitle border separator, simplify UI
1 parent 60a795e commit 7ca6661

File tree

4 files changed

+10
-37
lines changed

4 files changed

+10
-37
lines changed

Flow.Launcher/DefaultPreview.xaml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,9 @@
5050
TextAlignment="Center"
5151
TextWrapping="Wrap" />
5252
</StackPanel>
53-
<StackPanel Grid.Row="1">
54-
<StackPanel.Style>
55-
<Style TargetType="{x:Type StackPanel}">
56-
<Style.Triggers>
57-
<DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
58-
<Setter Property="Visibility" Value="Collapsed" />
59-
</DataTrigger>
60-
</Style.Triggers>
61-
</Style>
62-
</StackPanel.Style>
63-
<Separator Style="{DynamicResource PreviewSeparatorStyle}" />
64-
<TextBlock
65-
x:Name="PreviewSubTitle"
66-
Style="{DynamicResource PreviewItemSubTitleStyle}"
67-
Text="{Binding Result.SubTitle}" />
68-
</StackPanel>
53+
<TextBlock Grid.Row="1"
54+
x:Name="PreviewSubTitle"
55+
Style="{DynamicResource PreviewItemSubTitleStyle}"
56+
Text="{Binding Result.SubTitle}" />
6957
</Grid>
7058
</UserControl>

Flow.Launcher/Themes/Base.xaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -371,15 +371,6 @@
371371
x:Key="PreviewGlyph"
372372
BasedOn="{StaticResource BasePreviewGlyph}"
373373
TargetType="{x:Type TextBlock}" />
374-
<Style x:Key="BasePreviewSeparatorStyle" TargetType="{x:Type Separator}">
375-
<Setter Property="Visibility" Value="Visible" />
376-
<Setter Property="Margin" Value="0 15 5 5" />
377-
<Style.Triggers>
378-
<DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
379-
<Setter Property="Visibility" Value="Collapsed" />
380-
</DataTrigger>
381-
</Style.Triggers>
382-
</Style>
383374

384375
<Style
385376
x:Key="PreviewBorderStyle"
@@ -447,6 +438,12 @@
447438
<Setter Property="TextWrapping" Value="Wrap" />
448439
</Style>
449440
<Style x:Key="BasePreviewItemSubTitleStyle" TargetType="{x:Type TextBlock}">
441+
<Style.Triggers>
442+
<DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
443+
<Setter Property="Visibility" Value="Collapsed" />
444+
</DataTrigger>
445+
</Style.Triggers>
446+
450447
<Setter Property="Foreground" Value="#8f8f8f" />
451448
<Setter Property="FontSize" Value="12" />
452449
<Setter Property="FontWeight" Value="Normal" />

Flow.Launcher/Themes/Win10System.xaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,4 @@
187187
TargetType="{x:Type TextBlock}">
188188
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
189189
</Style>
190-
<Style
191-
x:Key="PreviewSeparatorStyle"
192-
TargetType="{x:Type Separator}"
193-
BasedOn="{StaticResource BasePreviewSeparatorStyle}">
194-
<Setter Property="Background" Value="{DynamicResource SeparatorForeground}" />
195-
</Style>
196190
</ResourceDictionary>

Flow.Launcher/Themes/Win11Light.xaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,4 @@
189189
TargetType="{x:Type TextBlock}">
190190
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
191191
</Style>
192-
<Style
193-
x:Key="PreviewSeparatorStyle"
194-
TargetType="{x:Type Separator}"
195-
BasedOn="{StaticResource BasePreviewSeparatorStyle}">
196-
<Setter Property="Background" Value="{DynamicResource SeparatorForeground}" />
197-
</Style>
198192
</ResourceDictionary>

0 commit comments

Comments
 (0)