Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 04:07:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix progressbar loading

Browse Source
This commit is contained in:
bao-qian
2016-04-25 03:00:55 +01:00
parent 99006465e6
commit 1ab4f99a37
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Wox/MainWindow.xaml
View File

@@ -37,12 +37,9 @@
PreviewDragOver="OnPreviewDragOver" PreviewDragOver="OnPreviewDragOver"
AllowDrop="True" AllowDrop="True"
x:Name="QueryTextBox" /> x:Name="QueryTextBox" />
<Line Style="{DynamicResource PendingLineStyle}" x:Name="ProgressBar" Y1="0" Y2="0" X2="100" Height="2" <Line x:Name="ProgressBar" HorizontalAlignment="Right"
StrokeThickness="1" Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay}"
Visibility="{Binding ProgressBarVisibility}" HorizontalAlignment="Right" Width="752"> Y1="0" Y2="0" X2="100" Height="2" Width="752" StrokeThickness="1">
<Line.ToolTip>
<ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}" />
</Line.ToolTip>
</Line> </Line>
<ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}" /> <ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}" />
<ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}" /> <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}" />

21
Wox/ViewModel/MainViewModel.cs
View File

@@ -15,7 +15,6 @@ using Wox.Infrastructure.Hotkey;
using Wox.Infrastructure.Storage; using Wox.Infrastructure.Storage;
using Wox.Plugin; using Wox.Plugin;
using Wox.Storage; using Wox.Storage;
using Stopwatch = Wox.Infrastructure.Stopwatch;
namespace Wox.ViewModel namespace Wox.ViewModel
{ {
@@ -80,7 +79,6 @@ namespace Wox.ViewModel
InitializeResultListBox(); InitializeResultListBox();
InitializeContextMenu(); InitializeContextMenu();
InitializeKeyCommands(); InitializeKeyCommands();
} }
~MainViewModel() ~MainViewModel()
@@ -121,19 +119,6 @@ namespace Wox.ViewModel
} }
} }
public bool IsProgressBarTooltipVisible
{
get
{
return _isProgressBarTooltipVisible;
}
set
{
_isProgressBarTooltipVisible = value;
OnPropertyChanged();
}
}
public double Left public double Left
{ {
get get
@@ -375,7 +360,7 @@ namespace Wox.ViewModel
private void HandleQueryTextUpdated() private void HandleQueryTextUpdated()
{ {
IsProgressBarTooltipVisible = false; ProgressBarVisibility = Visibility.Hidden;
_updateSource?.Cancel(); _updateSource?.Cancel();
_updateSource = new CancellationTokenSource(); _updateSource = new CancellationTokenSource();
_updateToken = _updateSource.Token; _updateToken = _updateSource.Token;
@@ -553,7 +538,7 @@ namespace Wox.ViewModel
public void UpdateResultView(List<Result> list, PluginMetadata metadata, Query originQuery) public void UpdateResultView(List<Result> list, PluginMetadata metadata, Query originQuery)
{ {
_queryHasReturn = true; _queryHasReturn = true;
IsProgressBarTooltipVisible = false; ProgressBarVisibility = Visibility.Hidden;
list.ForEach(o => list.ForEach(o =>
{ {
@@ -567,7 +552,7 @@ namespace Wox.ViewModel
}); });
} }
if (list.Count > 0 && ! ResultListBoxVisibility.IsVisible()) if (list.Count > 0 && !ResultListBoxVisibility.IsVisible())
{ {
ResultListBoxVisibility = Visibility.Visible; ResultListBoxVisibility = Visibility.Visible;
} }