Hex Editor - fix so that you can only highlight using left click (fixes the ability to highlight multiple addresses and use the context menu)

This commit is contained in:
adelikat 2012-10-15 00:56:47 +00:00
parent 4ffacf1ff8
commit 50b6a36661
1 changed files with 28 additions and 25 deletions

View File

@ -2326,43 +2326,46 @@ namespace BizHawk.MultiClient
private void AddressesLabel_MouseDown(object sender, MouseEventArgs e) private void AddressesLabel_MouseDown(object sender, MouseEventArgs e)
{ {
int addressOver = GetPointedAddress(e.X, e.Y); if (e.Button == MouseButtons.Left)
if (addressOver >= 0)
{ {
if ((Control.ModifierKeys & Keys.Control) == Keys.Control) int addressOver = GetPointedAddress(e.X, e.Y);
if (addressOver >= 0)
{ {
if (addressOver == addressHighlighted) if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
{ {
ClearHighlighted(); if (addressOver == addressHighlighted)
{
ClearHighlighted();
}
else if (SecondaryHighlightedAddresses.Contains(addressOver))
{
SecondaryHighlightedAddresses.Remove(addressOver);
}
else
{
SecondaryHighlightedAddresses.Add(addressOver);
}
} }
else if (SecondaryHighlightedAddresses.Contains(addressOver)) else if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift)
{ {
SecondaryHighlightedAddresses.Remove(addressOver); DoShiftClick();
} }
//else if (addressOver == addressHighlighted)
//{
// ClearHighlighted();
//}
else else
{ {
SecondaryHighlightedAddresses.Add(addressOver); SetHighlighted(addressOver);
SecondaryHighlightedAddresses.Clear();
FindStr = "";
} }
}
else if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) MemoryViewerBox.Refresh();
{
DoShiftClick();
}
//else if (addressOver == addressHighlighted)
//{
// ClearHighlighted();
//}
else
{
SetHighlighted(addressOver);
SecondaryHighlightedAddresses.Clear();
FindStr = "";
} }
MemoryViewerBox.Refresh(); MouseIsDown = true;
} }
MouseIsDown = true;
} }
private void AddressesLabel_MouseUp(object sender, MouseEventArgs e) private void AddressesLabel_MouseUp(object sender, MouseEventArgs e)