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

Fix UI flickering

Browse Source 
See #350
This commit is contained in:
bao-qian
2015-11-06 21:30:38 +00:00
parent 64e020b1ad
commit cae8485092
3 changed files with 110 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Wox/MainWindow.xaml.cs
View File

@@ -441,36 +441,33 @@ namespace Wox
private void TbQuery_OnTextChanged(object sender, TextChangedEventArgs e)
{
if (ignoreTextChange) { ignoreTextChange = false; return; }
toolTip.IsOpen = false;
pnlResult.Dirty = true;
if (IsInContextMenuMode)
if (!string.IsNullOrEmpty(tbQuery.Text.Trim()))
{
QueryContextMenu();
return;
}
queryHasReturn = false;
Dispatcher.DelayInvoke("ClearResults", () =>
{
// Delay the invocation of clear method of pnlResult, minimize the time-span between clear results and add new results.
// So this will reduce splash issues. After waiting 100ms, if there still no results added, we
// must clear the result. otherwise, it will be confused why the query changed, but the results
// didn't.
if (pnlResult.Dirty) pnlResult.Clear();
}, TimeSpan.FromMilliseconds(100));
Query(tbQuery.Text);
Dispatcher.DelayInvoke("ShowProgressbar", () =>
{
if (!string.IsNullOrEmpty(tbQuery.Text.Trim()) && tbQuery.Text != lastQuery && !queryHasReturn)
toolTip.IsOpen = false;
if (IsInContextMenuMode)
{
StartProgress();
QueryContextMenu();
return;
}
}, TimeSpan.FromMilliseconds(150));
//reset query history index after user start new query
ResetQueryHistoryIndex();
Query(tbQuery.Text);
Dispatcher.DelayInvoke("ShowProgressbar", () =>
{
if (!string.IsNullOrEmpty(tbQuery.Text.Trim()) && tbQuery.Text != lastQuery && !queryHasReturn)
{
StartProgress();
}
}, TimeSpan.FromMilliseconds(150));
//reset query history index after user start new query
ResetQueryHistoryIndex();
}
else
{
pnlResult.Clear();
}
}
private void ResetQueryHistoryIndex()
@@ -720,7 +717,6 @@ namespace Wox
if (history != null)
{
ChangeQueryText(history.Query, true);
pnlResult.Dirty = true;
var executeQueryHistoryTitle = GetTranslation("executeQuery");
var lastExecuteTime = GetTranslation("lastExecuteTime");
UpdateResultViewInternal(new List<Result>()

118
Wox/ResultPanel.xaml.cs
View File

@@ -1,20 +1,27 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Linq;
using System.Runtime.Remoting.Contexts;
using Wox.Core.UserSettings;
using Wox.Plugin;
using Wox.Storage;
namespace Wox
{
[Synchronization]
public partial class ResultPanel : UserControl
{
public event Action<Result> LeftMouseClickEvent;
public event Action<Result> RightMouseClickEvent;
public event Action<Result, IDataObject, DragEventArgs> ItemDropEvent;
private readonly ObservableCollection<Result> _results; //todo, for better performance, override the default linear search
private readonly object _resultsUpdateLock = new object();
protected virtual void OnRightMouseClick(Result result)
{
@@ -28,36 +35,69 @@ namespace Wox
if (handler != null) handler(result);
}
public bool Dirty { get; set; }
public int MaxResultsToShow { get { return UserSettingStorage.Instance.MaxResultsToShow * 50; } }
public void AddResults(List<Result> results)
public void AddResults(List<Result> newResults)
{
if (Dirty)
if (newResults != null && newResults.Count > 0)
{
Dirty = false;
lbResults.Items.Clear();
}
foreach (var result in results)
{
int position = 0;
if (IsTopMostResult(result))
lock (_resultsUpdateLock)
{
result.Score = int.MaxValue;
}
else
{
if (result.Score >= int.MaxValue)
var pluginId = newResults[0].PluginID;
var actionKeyword = newResults[0].OriginQuery.ActionKeyword;
List<Result> oldResults;
if (string.IsNullOrEmpty(actionKeyword))
{
result.Score = int.MaxValue - 1;
oldResults = _results.Where(r => r.PluginID == pluginId).ToList();
}
position = GetInsertLocation(result.Score);
else
{
oldResults = _results.ToList();
}
// intersection of A (old results) and B (new newResults)
var intersection = oldResults.Intersect(newResults).ToList();
// remove result of relative complement of B in A
foreach (var result in oldResults.Except(intersection))
{
_results.Remove(result);
}
// update scores
foreach (var result in newResults)
{
if (IsTopMostResult(result))
{
result.Score = int.MaxValue;
}
}
// update index for result in intersection of A and B
foreach (var result in intersection)
{
int oldIndex = _results.IndexOf(result);
int oldScore = _results[oldIndex].Score;
if (result.Score != oldScore)
{
int newIndex = InsertIndexOf(result.Score);
if (newIndex != oldIndex)
{
_results.Move(oldIndex, newIndex);
}
}
}
// insert result in relative complement of A in B
foreach (var result in newResults.Except(intersection))
{
int newIndex = InsertIndexOf(result.Score);
_results.Insert(newIndex, result);
}
lbResults.Margin = lbResults.Items.Count > 0 ? new Thickness { Top = 8 } : new Thickness { Top = 0 };
SelectFirst();
}
lbResults.Items.Insert(position, result);
}
lbResults.Margin = lbResults.Items.Count > 0 ? new Thickness { Top = 8 } : new Thickness { Top = 0 };
SelectFirst();
}
private bool IsTopMostResult(Result result)
@@ -65,33 +105,18 @@ namespace Wox
return TopMostRecordStorage.Instance.IsTopMost(result);
}
private int GetInsertLocation(int currentScore)
private int InsertIndexOf(int newScore)
{
int location = lbResults.Items.Count;
if (lbResults.Items.Count == 0) return 0;
if (currentScore > ((Result)lbResults.Items[0]).Score) return 0;
for (int index = 1; index < lbResults.Items.Count; index++)
int index = 0;
for (; index < lbResults.Items.Count; index++)
{
Result next = lbResults.Items[index] as Result;
Result prev = lbResults.Items[index - 1] as Result;
if (next != null && prev != null)
Result result = lbResults.Items[index] as Result;
if (newScore > result?.Score)
{
if ((currentScore >= next.Score && currentScore <= prev.Score))
{
if (currentScore == next.Score)
{
location = index + 1;
}
else
{
location = index;
}
}
break;
}
}
return location;
return index;
}
public void SelectNext()
@@ -211,12 +236,17 @@ namespace Wox
public ResultPanel()
{
InitializeComponent();
_results = new ObservableCollection<Result>();
lbResults.ItemsSource = _results;
}
public void Clear()
{
lbResults.Items.Clear();
lbResults.Margin = new Thickness { Top = 0 };
lock (_resultsUpdateLock)
{
_results.Clear();
lbResults.Margin = new Thickness { Top = 0 };
}
}
private void lbResults_SelectionChanged(object sender, SelectionChangedEventArgs e)