Skip to content

Commit bdcf419

Browse files
committed
- Move Seperator toggle style to mainwindow xaml (for preview separator binding issue)
1 parent fe90ebc commit bdcf419

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,25 @@
104104
</Grid>
105105

106106
<Grid ClipToBounds="True">
107-
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
107+
<ContentControl>
108+
<ContentControl.Style>
109+
<Style TargetType="ContentControl">
110+
<Setter Property="Visibility" Value="Collapsed" />
111+
<Style.Triggers>
112+
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
113+
<Setter Property="Visibility" Value="Visible" />
114+
</DataTrigger>
115+
<DataTrigger Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Visible">
116+
<Setter Property="Visibility" Value="Visible" />
117+
</DataTrigger>
118+
<DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
119+
<Setter Property="Visibility" Value="Visible" />
120+
</DataTrigger>
121+
</Style.Triggers>
122+
</Style>
123+
</ContentControl.Style>
124+
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}"/>
125+
</ContentControl>
108126
<Line x:Name="ProgressBar" HorizontalAlignment="Right"
109127
Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
110128
Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">

Flow.Launcher/Themes/Base.xaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -223,31 +223,16 @@
223223
</ControlTemplate>
224224
</Setter.Value>
225225
</Setter>
226-
227226
</Style>
228227
<Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
229-
<Setter Property="Visibility" Value="Collapsed" />
230-
<Style.Triggers>
231-
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
232-
<Setter Property="Visibility" Value="Visible" />
233-
</DataTrigger>
234-
<DataTrigger Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Visible">
235-
<Setter Property="Visibility" Value="Visible" />
236-
</DataTrigger>
237-
<DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
238-
<Setter Property="Visibility" Value="Visible" />
239-
</DataTrigger>
240-
</Style.Triggers>
241228
</Style>
242229
<Style x:Key="HighlightStyle">
243230
<Setter Property="Inline.FontWeight" Value="Bold" />
244231
</Style>
245-
246232
<Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
247233
<Setter Property="FontSize" Value="15" />
248234
<Setter Property="Foreground" Value="#8f8f8f" />
249235
</Style>
250-
251236
<Style x:Key="BaseItemHotkeySelecetedStyle" TargetType="{x:Type TextBlock}">
252237
<Setter Property="FontSize" Value="15" />
253238
<Setter Property="Foreground" Value="#8f8f8f" />

0 commit comments

Comments
 (0)