empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Fixed mouse clicks not always being registered properly in ppu viewers

Browse source
This commit is contained in:
Sour 2019-06-24 11:53:58 -04:00
parent cf6b21bf23
commit 0b40b7a437
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UI/Debugger/PpuViewer/ctrlImagePanel.cs
View file

@ -19,7 +19,6 @@ namespace Mesen.GUI.Debugger.PpuViewer
private Size _imageSize; private Size _imageSize;
private bool _mouseDown = false; private bool _mouseDown = false;
private bool _dragging = false;
private Point _lastLocation = Point.Empty; private Point _lastLocation = Point.Empty;
public Rectangle Selection { get { return ctrlImageViewer.Selection; } set { ctrlImageViewer.Selection = value; } } public Rectangle Selection { get { return ctrlImageViewer.Selection; } set { ctrlImageViewer.Selection = value; } }
@ -71,13 +70,10 @@ namespace Mesen.GUI.Debugger.PpuViewer
ctrlImageViewer.MouseUp += (s, e) => { ctrlImageViewer.MouseUp += (s, e) => {
_mouseDown = false; _mouseDown = false;
_dragging = false;
}; };
ctrlImageViewer.MouseClick += (s, e) => { ctrlImageViewer.MouseClick += (s, e) => {
if(!_dragging) {
this.MouseClick?.Invoke(s, e); this.MouseClick?.Invoke(s, e);
}
}; };
ctrlImageViewer.MouseMove += ctrlImageViewer_MouseMove; ctrlImageViewer.MouseMove += ctrlImageViewer_MouseMove;
@ -86,7 +82,6 @@ namespace Mesen.GUI.Debugger.PpuViewer
private void ctrlImageViewer_MouseMove(object sender, MouseEventArgs e) private void ctrlImageViewer_MouseMove(object sender, MouseEventArgs e)
{ {
if(_mouseDown) { if(_mouseDown) {
_dragging = true;
ctrlImageViewer.MouseMove -= ctrlImageViewer_MouseMove; ctrlImageViewer.MouseMove -= ctrlImageViewer_MouseMove;
int hScroll = Math.Min(ctrlPanel.HorizontalScroll.Maximum, Math.Max(0, ctrlPanel.HorizontalScroll.Value - (e.Location.X - _lastLocation.X))); int hScroll = Math.Min(ctrlPanel.HorizontalScroll.Maximum, Math.Max(0, ctrlPanel.HorizontalScroll.Value - (e.Location.X - _lastLocation.X)));
int vScroll = Math.Min(ctrlPanel.VerticalScroll.Maximum, Math.Max(0, ctrlPanel.VerticalScroll.Value - (e.Location.Y - _lastLocation.Y))); int vScroll = Math.Min(ctrlPanel.VerticalScroll.Maximum, Math.Max(0, ctrlPanel.VerticalScroll.Value - (e.Location.Y - _lastLocation.Y)));