Skip to content

Commit 61aaa01

Browse files
authored
Merge pull request #1652 from onesounds/FixProgressBarMargin
Fix the bottom margin issue when loading progress
2 parents 57a452e + 6998d3a commit 61aaa01

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

Flow.Launcher/ResultListBox.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
99
MaxHeight="{Binding MaxHeight}"
10-
Margin="{DynamicResource ResultMargin}"
1110
HorizontalContentAlignment="Stretch"
1211
d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
1312
d:DesignHeight="100"

Flow.Launcher/Themes/Base.xaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,9 @@
248248
<Setter Property="Background" Value="Transparent" />
249249
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
250250
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
251-
<Setter Property="Margin" Value="0,0,0,0" />
251+
<Setter Property="Margin" Value="{DynamicResource ResultMargin}" />
252252
<Setter Property="Padding" Value="0,0,0,0" />
253+
253254
<Setter Property="Template">
254255
<Setter.Value>
255256
<ControlTemplate TargetType="ListBox">
@@ -273,6 +274,11 @@
273274
</ControlTemplate>
274275
</Setter.Value>
275276
</Setter>
277+
<Style.Triggers>
278+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Items.Count}" Value="0">
279+
<Setter Property="Margin" Value="0" />
280+
</DataTrigger>
281+
</Style.Triggers>
276282
</Style>
277283

278284
<!-- ScrollViewer Style -->
@@ -360,7 +366,6 @@
360366
<Style.Triggers>
361367
<MultiDataTrigger>
362368
<MultiDataTrigger.Conditions>
363-
<Condition Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
364369
<Condition Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Collapsed" />
365370
<Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
366371
<Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />

Flow.Launcher/Themes/Win10Light.xaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
TargetType="{x:Type TextBlock}">
1313
<Setter Property="Foreground" Value="#000000" />
1414
</Style>
15+
<Style
16+
x:Key="ItemGlyphSelectedStyle"
17+
BasedOn="{StaticResource BaseGlyphStyle}"
18+
TargetType="{x:Type TextBlock}">
19+
<Setter Property="Foreground" Value="#000000" />
20+
</Style>
1521
<Style
1622
x:Key="QueryBoxStyle"
1723
BasedOn="{StaticResource BaseQueryBoxStyle}"

0 commit comments

Comments
 (0)