ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InputRoll - ctrl-click now toggle if clicking an already highlighted row

This commit is contained in:
adelikat 2014-09-21 16:00:42 +00:00
parent 8b212da594
commit 44fe60f253
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
View File

@ -899,11 +899,6 @@ namespace BizHawk.Client.EmuHawk
#region Mouse and Key Events #region Mouse and Key Events
//protected override void OnKeyDown(KeyEventArgs e)
//{
// base.OnKeyDown(e);
//}
protected override void OnMouseMove(MouseEventArgs e) protected override void OnMouseMove(MouseEventArgs e)
{ {
var newCell = CalculatePointedCell(e.X, e.Y); var newCell = CalculatePointedCell(e.X, e.Y);
@ -978,7 +973,7 @@ namespace BizHawk.Client.EmuHawk
} }
else if (ModifierKeys == Keys.Control) else if (ModifierKeys == Keys.Control)
{ {
SelectCell(CurrentCell); SelectCell(CurrentCell, toggle: true);
} }
else else
{ {
@ -1237,7 +1232,7 @@ namespace BizHawk.Client.EmuHawk
/// If FullRowSelect is enabled, selects all cells in the row that contains the given cell. Otherwise only given cell is added. /// If FullRowSelect is enabled, selects all cells in the row that contains the given cell. Otherwise only given cell is added.
/// </summary> /// </summary>
/// <param name="cell">The cell to select.</param> /// <param name="cell">The cell to select.</param>
private void SelectCell(Cell cell) private void SelectCell(Cell cell, bool toggle = false)
{ {
if (!MultiSelect) if (!MultiSelect)
{ {
@ -1246,18 +1241,45 @@ namespace BizHawk.Client.EmuHawk
if (FullRowSelect) if (FullRowSelect)
{ {
foreach (var column in _columns) if (toggle && SelectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex))
{ {
SelectedItems.Add(new Cell var items = SelectedItems
.Where(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex)
.ToList();
foreach (var item in items)
{ {
RowIndex = cell.RowIndex, SelectedItems.Remove(item);
Column = column }
}); }
else
{
foreach (var column in _columns)
{
SelectedItems.Add(new Cell
{
RowIndex = cell.RowIndex,
Column = column
});
}
} }
} }
else else
{ {
SelectedItems.Add(CurrentCell); if (toggle && SelectedItems.Any(x => x.RowIndex.HasValue && x.RowIndex == cell.RowIndex))
{
var item = SelectedItems
.FirstOrDefault(x => x.Equals(cell));
if (item != null)
{
SelectedItems.Remove(item);
}
}
else
{
SelectedItems.Add(CurrentCell);
}
} }
SelectedIndexChanged(this, new EventArgs()); SelectedIndexChanged(this, new EventArgs());