Input Roll - move selection logic from Mouse click to Mouse down

This commit is contained in:
adelikat 2014-08-29 17:42:07 +00:00
parent 32795e1364
commit 15ba976416
1 changed files with 37 additions and 39 deletions

View File

@ -852,45 +852,6 @@ namespace BizHawk.Client.EmuHawk
base.OnMouseLeave(e);
}
protected override void OnMouseClick(MouseEventArgs e)
{
if (IsHoveringOnColumnCell)
{
ColumnClickEvent(ColumnAtX(e.X));
}
else if (IsHoveringOnDataCell)
{
if (ModifierKeys == Keys.Alt)
{
MessageBox.Show("Alt click logic is not yet implemented");
}
else if (ModifierKeys == Keys.Shift)
{
if (SelectedItems.Any())
{
MessageBox.Show("Shift click logic is not yet implemented");
}
else
{
SelectCell(CurrentCell);
}
}
else if (ModifierKeys == Keys.Control)
{
SelectCell(CurrentCell);
}
else
{
SelectedItems.Clear();
SelectCell(CurrentCell);
}
Refresh();
}
base.OnMouseClick(e);
}
protected override void OnMouseDown(MouseEventArgs e)
{
if (e.Button == MouseButtons.Left && InputPaintingMode)
@ -903,6 +864,43 @@ namespace BizHawk.Client.EmuHawk
RightButtonHeld = true;
}
if (e.Button == MouseButtons.Left)
{
if (IsHoveringOnColumnCell)
{
ColumnClickEvent(ColumnAtX(e.X));
}
else if (IsHoveringOnDataCell)
{
if (ModifierKeys == Keys.Alt)
{
MessageBox.Show("Alt click logic is not yet implemented");
}
else if (ModifierKeys == Keys.Shift)
{
if (SelectedItems.Any())
{
MessageBox.Show("Shift click logic is not yet implemented");
}
else
{
SelectCell(CurrentCell);
}
}
else if (ModifierKeys == Keys.Control)
{
SelectCell(CurrentCell);
}
else
{
SelectedItems.Clear();
SelectCell(CurrentCell);
}
Refresh();
}
}
base.OnMouseDown(e);
}