Skip to content

Commit b476c7f

Browse files
committed
Fix string count visibility when file closed
1 parent e6e1aa6 commit b476c7f

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

StringSpy/ViewModels/StringsViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ public void CloseFile()
144144
{
145145
CancelSearch();
146146
AllStringResults.Clear();
147+
AllStringResults = [];
147148
FilteredStrings.Clear();
149+
FilteredStrings = [];
148150
LoadedFile = null;
149151
}
150152

StringSpy/Views/StringsView.axaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,21 @@
192192
<ProgressBar Grid.Column="1" Value="{Binding ProgressValue}" />
193193
</Grid>
194194

195-
<Grid ColumnDefinitions="*,Auto,Auto"
195+
<Grid ColumnDefinitions="*,Auto"
196196
IsVisible="{Binding ProgressText, Converter={x:Static ObjectConverters.IsNull}}">
197197
<TextBlock Grid.Column="0" Text="{Binding LoadedFile}" VerticalAlignment="Center" Margin="5" />
198198

199-
<TextBlock Grid.Column="1"
200-
IsVisible="{Binding SearchText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
201-
VerticalAlignment="Center"
202-
Theme="{DynamicResource CaptionTextBlockStyle}"
203-
Text="{Binding FilteredStrings.Count, StringFormat='{}{0:N0} / '}" />
199+
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0 0 5 0">
200+
<TextBlock
201+
IsVisible="{Binding SearchText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
202+
VerticalAlignment="Center"
203+
Theme="{DynamicResource CaptionTextBlockStyle}"
204+
Text="{Binding FilteredStrings.Count, StringFormat='{}{0:N0} / '}" />
204205

205-
<TextBlock Grid.Column="2" VerticalAlignment="Center"
206-
Theme="{DynamicResource CaptionTextBlockStyle}"
207-
Text="{Binding AllStringResults.Count, StringFormat='{}{0:N0} results'}" Margin="0 0 5 0" />
206+
<TextBlock VerticalAlignment="Center"
207+
Theme="{DynamicResource CaptionTextBlockStyle}"
208+
Text="{Binding AllStringResults.Count, StringFormat='{}{0:N0} results'}" />
209+
</StackPanel>
208210
</Grid>
209211
</Panel>
210212
</Border>

0 commit comments

Comments
 (0)