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

fix selected item

Browse Source 
part of #412
This commit is contained in:
bao-qian
2016-05-06 03:24:14 +01:00
parent fe5bb1d885
commit 407f58da54
6 changed files with 81 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Wox/ViewModel/MainViewModel.cs
View File

@@ -167,30 +167,33 @@ namespace Wox.ViewModel
Process.Start("http://doc.getwox.com");
});
OpenResultCommand = new RelayCommand(o =>
OpenResultCommand = new RelayCommand(index =>
{
var results = ContextMenuVisibility.IsVisible() ? ContextMenu : Results;
if (o != null)
if (index != null)
{
var index = int.Parse(o.ToString());
results.SelectResult(index);
results.SelectedIndex = int.Parse(index.ToString());
}
var result = results.SelectedResult.RawResult;
bool hideWindow = result.Action(new ActionContext
var result = results.SelectedItem?.RawResult;
if (result != null) // SelectedItem returns null if selection is empty.
{
SpecialKeyState = GlobalHotkey.Instance.CheckModifiers()
});
if (hideWindow)
{
MainWindowVisibility = Visibility.Collapsed;
}
bool hideWindow = result.Action(new ActionContext
{
SpecialKeyState = GlobalHotkey.Instance.CheckModifiers()
});
if (!ContextMenuVisibility.IsVisible())
{
_userSelectedRecord.Add(result);
_queryHistory.Add(result.OriginQuery.RawQuery);
if (hideWindow)
{
MainWindowVisibility = Visibility.Collapsed;
}
if (!ContextMenuVisibility.IsVisible())
{
_userSelectedRecord.Add(result);
_queryHistory.Add(result.OriginQuery.RawQuery);
}
}
});
@@ -198,19 +201,23 @@ namespace Wox.ViewModel
{
if (!ContextMenuVisibility.IsVisible())
{
var result = Results.SelectedResult.RawResult;
var id = result.PluginID;
var result = Results.SelectedItem?.RawResult;
var menus = PluginManager.GetContextMenusForPlugin(result);
menus.Add(ContextMenuTopMost(result));
menus.Add(ContextMenuPluginInfo(id));
ContextMenu.Clear();
Task.Run(() =>
if (result != null) // SelectedItem returns null if selection is empty.
{
ContextMenu.AddResults(menus, id);
}, _updateToken);
ContextMenuVisibility = Visibility.Visible;
var id = result.PluginID;
var menus = PluginManager.GetContextMenusForPlugin(result);
menus.Add(ContextMenuTopMost(result));
menus.Add(ContextMenuPluginInfo(id));
ContextMenu.Clear();
Task.Run(() =>
{
ContextMenu.AddResults(menus, id);
}, _updateToken);
ContextMenuVisibility = Visibility.Visible;
}
}
else
{

106
Wox/ViewModel/ResultsViewModel.cs
View File

@@ -4,12 +4,10 @@ using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Data;
using Wox.Core.UserSettings;
using Wox.Plugin;
using Wox.Storage;
namespace Wox.ViewModel
{
@@ -17,7 +15,7 @@ namespace Wox.ViewModel
{
#region Private Fields
private ResultViewModel _selectedResult;
private int _selectedIndex;
public ResultCollection Results { get; }
private Thickness _margin;
@@ -38,35 +36,17 @@ namespace Wox.ViewModel
public int MaxHeight => _settings.MaxResultsToShow * 50;
public ResultViewModel SelectedResult
public int SelectedIndex
{
get
{
return _selectedResult;
}
get { return _selectedIndex; }
set
{
if (value != null)
{
if (_selectedResult != null)
{
_selectedResult.IsSelected = false;
}
_selectedResult = value;
if (_selectedResult != null)
{
_selectedResult.IsSelected = true;
}
}
_selectedIndex = value;
OnPropertyChanged();
}
}
public ResultViewModel SelectedItem { get; set; }
public Thickness Margin
{
get
@@ -98,76 +78,44 @@ namespace Wox.ViewModel
return index;
}
private int NewIndex(int i)
{
var n = Results.Count;
if (n > 0)
{
i = (n + i) % n;
return i;
}
else
{
// SelectedIndex returns -1 if selection is empty.
return -1;
}
}
#endregion
#region Public Methods
public void SelectResult(int index)
{
if (index <= Results.Count - 1)
{
SelectedResult = Results[index];
}
}
public void SelectResult(ResultViewModel result)
{
int i = Results.IndexOf(result);
SelectResult(i);
}
public void SelectNextResult()
{
if (Results.Count > 0 && SelectedResult != null)
{
var index = Results.IndexOf(SelectedResult);
if (index == Results.Count - 1)
{
index = -1;
}
SelectedResult = Results.ElementAt(index + 1);
}
SelectedIndex = NewIndex(SelectedIndex + 1);
}
public void SelectPrevResult()
{
if (Results.Count > 0 && SelectedResult != null)
{
var index = Results.IndexOf(SelectedResult);
if (index == 0)
{
index = Results.Count;
}
SelectedResult = Results.ElementAt(index - 1);
}
SelectedIndex = NewIndex(SelectedIndex - 1);
}
public void SelectNextPage()
{
if (Results.Count > 0 && SelectedResult != null)
{
var index = Results.IndexOf(SelectedResult);
index += 5;
if (index > Results.Count - 1)
{
index = Results.Count - 1;
}
SelectedResult = Results.ElementAt(index);
}
SelectedIndex = NewIndex(SelectedIndex + _settings.MaxResultsToShow);
}
public void SelectPrevPage()
{
if (Results.Count > 0 && SelectedResult != null)
{
var index = Results.IndexOf(SelectedResult);
index -= 5;
if (index < 0)
{
index = 0;
}
SelectedResult = Results.ElementAt(index);
}
SelectedIndex = NewIndex(SelectedIndex - _settings.MaxResultsToShow);
}
public void Clear()
@@ -239,7 +187,7 @@ namespace Wox.ViewModel
if (Results.Count > 0)
{
Margin = new Thickness { Top = 8 };
SelectedResult = Results[0];
SelectedIndex = 0;
}
else
{
@@ -314,6 +262,8 @@ namespace Wox.ViewModel
}
}
public ResultViewModel this[int selectedIndex] => Results[selectedIndex];
}
}