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

ResultItem -> Result, part 2

Browse Source 
part of refactoring for PR #494
This commit is contained in:
bao-qian
2016-02-21 15:19:42 +00:00
parent cb6160f1e4
commit 6814130570
10 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Wox/ViewModel/ResultViewModel.cs
View File

@@ -12,7 +12,7 @@ using Wox.Storage;
namespace Wox.ViewModel
{
public class ResultItemViewModel : BaseViewModel
public class ResultViewModel : BaseViewModel
{
#region Private Fields
@@ -23,7 +23,7 @@ namespace Wox.ViewModel
#region Constructor
public ResultItemViewModel(Result result)
public ResultViewModel(Result result)
{
if (null != result)
{
@@ -160,7 +160,7 @@ namespace Wox.ViewModel
public override bool Equals(object obj)
{
ResultItemViewModel r = obj as ResultItemViewModel;
ResultViewModel r = obj as ResultViewModel;
if (r != null)
{
return _result.Equals(r.RawResult);

31
Wox/ViewModel/ResultsViewModel.cs
View File

@@ -17,7 +17,7 @@ namespace Wox.ViewModel
{
#region Private Fields
private ResultItemViewModel _selectedResult;
private ResultViewModel _selectedResult;
private ResultCollection _results;
private bool _isVisible;
private Thickness _margin;
@@ -53,7 +53,7 @@ namespace Wox.ViewModel
}
}
public ResultItemViewModel SelectedResult
public ResultViewModel SelectedResult
{
get
{
@@ -104,7 +104,7 @@ namespace Wox.ViewModel
return TopMostRecordStorage.Instance.IsTopMost(result);
}
private int InsertIndexOf(int newScore, IList<ResultItemViewModel> list)
private int InsertIndexOf(int newScore, IList<ResultViewModel> list)
{
int index = 0;
for (; index < list.Count; index++)
@@ -211,8 +211,8 @@ namespace Wox.ViewModel
{
lock (_resultsUpdateLock)
{
var newResults = new List<ResultItemViewModel>();
newRawResults.ForEach((re) => { newResults.Add(new ResultItemViewModel(re)); });
var newResults = new List<ResultViewModel>();
newRawResults.ForEach((re) => { newResults.Add(new ResultViewModel(re)); });
// todo use async to do new result calculation
var resultsCopy = _results.ToList();
var oldResults = resultsCopy.Where(r => r.RawResult.PluginID == resultId).ToList();
@@ -275,19 +275,18 @@ namespace Wox.ViewModel
#endregion
public class ResultCollection : ObservableCollection<ResultItemViewModel>
// todo implement custom moveItem,removeItem,insertItem for better performance
public class ResultCollection : ObservableCollection<ResultViewModel>
{
public ResultCollection()
{
}
public void RemoveAll(Predicate<ResultItemViewModel> predicate)
public void RemoveAll(Predicate<ResultViewModel> predicate)
{
CheckReentrancy();
List<ResultItemViewModel> itemsToRemove = Items.Where(x => predicate(x)).ToList();
List<ResultViewModel> itemsToRemove = Items.Where(x => predicate(x)).ToList();
if (itemsToRemove.Count > 0)
{
@@ -309,22 +308,22 @@ namespace Wox.ViewModel
}
public void Update(List<ResultItemViewModel> newItems)
public void Update(List<ResultViewModel> newItems)
{
int newCount = newItems.Count;
int oldCount = Items.Count;
int location = newCount > oldCount ? oldCount : newCount;
for (int i = 0; i < location; i++)
{
ResultItemViewModel oldItem = Items[i];
ResultItemViewModel newItem = newItems[i];
if (!oldItem.Equals(newItem))
ResultViewModel oldResult = Items[i];
ResultViewModel newResult = newItems[i];
if (!oldResult.Equals(newResult))
{
this[i] = newItem;
this[i] = newResult;
}
else if (oldItem.RawResult.Score != newItem.RawResult.Score)
else if (oldResult.RawResult.Score != newResult.RawResult.Score)
{
this[i].RawResult.Score = newItem.RawResult.Score;
this[i].RawResult.Score = newResult.RawResult.Score;
}
}