Ram Watch - remove pause feature, it was only a hack for when ram watch was too slow, it's plenty fast now
This commit is contained in:
parent
8c17ac8da9
commit
980104b90b
|
@ -68,7 +68,6 @@
|
||||||
this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
|
this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
|
||||||
this.moveDownToolStripButton = new System.Windows.Forms.ToolStripButton();
|
this.moveDownToolStripButton = new System.Windows.Forms.ToolStripButton();
|
||||||
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.pauseToolStripButton = new System.Windows.Forms.ToolStripButton();
|
|
||||||
this.RamWatchMenu = new MenuStripEx();
|
this.RamWatchMenu = new MenuStripEx();
|
||||||
this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
|
this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.NewListMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.NewListMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
@ -98,8 +97,6 @@
|
||||||
this.MoveTopMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.MoveTopMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.MoveBottomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.MoveBottomMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
|
||||||
this.PauseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
|
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem();
|
this.DefinePreviousValueSubMenu = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.PreviousFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
@ -338,8 +335,7 @@
|
||||||
this.toolStripSeparator6,
|
this.toolStripSeparator6,
|
||||||
this.moveUpToolStripButton,
|
this.moveUpToolStripButton,
|
||||||
this.moveDownToolStripButton,
|
this.moveDownToolStripButton,
|
||||||
this.toolStripSeparator5,
|
this.toolStripSeparator5});
|
||||||
this.pauseToolStripButton});
|
|
||||||
this.toolStrip1.Location = new System.Drawing.Point(0, 24);
|
this.toolStrip1.Location = new System.Drawing.Point(0, 24);
|
||||||
this.toolStrip1.Name = "toolStrip1";
|
this.toolStrip1.Name = "toolStrip1";
|
||||||
this.toolStrip1.Size = new System.Drawing.Size(364, 25);
|
this.toolStrip1.Size = new System.Drawing.Size(364, 25);
|
||||||
|
@ -497,16 +493,6 @@
|
||||||
this.toolStripSeparator5.Name = "toolStripSeparator5";
|
this.toolStripSeparator5.Name = "toolStripSeparator5";
|
||||||
this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
|
this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
|
||||||
//
|
//
|
||||||
// pauseToolStripButton
|
|
||||||
//
|
|
||||||
this.pauseToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
|
|
||||||
this.pauseToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
|
|
||||||
this.pauseToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
|
|
||||||
this.pauseToolStripButton.Name = "pauseToolStripButton";
|
|
||||||
this.pauseToolStripButton.Size = new System.Drawing.Size(23, 22);
|
|
||||||
this.pauseToolStripButton.Text = "Pause";
|
|
||||||
this.pauseToolStripButton.Click += new System.EventHandler(this.PauseMenuItem_Click);
|
|
||||||
//
|
|
||||||
// RamWatchMenu
|
// RamWatchMenu
|
||||||
//
|
//
|
||||||
this.RamWatchMenu.ClickThrough = true;
|
this.RamWatchMenu.ClickThrough = true;
|
||||||
|
@ -626,9 +612,7 @@
|
||||||
this.MoveDownMenuItem,
|
this.MoveDownMenuItem,
|
||||||
this.MoveTopMenuItem,
|
this.MoveTopMenuItem,
|
||||||
this.MoveBottomMenuItem,
|
this.MoveBottomMenuItem,
|
||||||
this.SelectAllMenuItem,
|
this.SelectAllMenuItem});
|
||||||
this.toolStripSeparator2,
|
|
||||||
this.PauseMenuItem});
|
|
||||||
this.WatchesSubMenu.Name = "WatchesSubMenu";
|
this.WatchesSubMenu.Name = "WatchesSubMenu";
|
||||||
this.WatchesSubMenu.Size = new System.Drawing.Size(64, 20);
|
this.WatchesSubMenu.Size = new System.Drawing.Size(64, 20);
|
||||||
this.WatchesSubMenu.Text = "&Watches";
|
this.WatchesSubMenu.Text = "&Watches";
|
||||||
|
@ -775,19 +759,6 @@
|
||||||
this.SelectAllMenuItem.Text = "Select &All";
|
this.SelectAllMenuItem.Text = "Select &All";
|
||||||
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
|
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
|
||||||
//
|
//
|
||||||
// toolStripSeparator2
|
|
||||||
//
|
|
||||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
|
||||||
this.toolStripSeparator2.Size = new System.Drawing.Size(241, 6);
|
|
||||||
//
|
|
||||||
// PauseMenuItem
|
|
||||||
//
|
|
||||||
this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
|
|
||||||
this.PauseMenuItem.Name = "PauseMenuItem";
|
|
||||||
this.PauseMenuItem.Size = new System.Drawing.Size(244, 22);
|
|
||||||
this.PauseMenuItem.Text = "&Pause";
|
|
||||||
this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click);
|
|
||||||
//
|
|
||||||
// OptionsSubMenu
|
// OptionsSubMenu
|
||||||
//
|
//
|
||||||
this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
@ -1004,9 +975,6 @@
|
||||||
private StatusStripEx statusStrip1;
|
private StatusStripEx statusStrip1;
|
||||||
private System.Windows.Forms.ToolStripStatusLabel MessageLabel;
|
private System.Windows.Forms.ToolStripStatusLabel MessageLabel;
|
||||||
private System.Windows.Forms.ToolStripButton ErrorIconButton;
|
private System.Windows.Forms.ToolStripButton ErrorIconButton;
|
||||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem PauseMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripButton pauseToolStripButton;
|
|
||||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
|
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
|
||||||
private System.Windows.Forms.ToolStripSeparator Separator4;
|
private System.Windows.Forms.ToolStripSeparator Separator4;
|
||||||
private System.Windows.Forms.ToolStripMenuItem ReadBreakpointContextMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem ReadBreakpointContextMenuItem;
|
||||||
|
|
|
@ -22,7 +22,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
private int _defaultHeight;
|
private int _defaultHeight;
|
||||||
private string _sortedColumn;
|
private string _sortedColumn;
|
||||||
private bool _sortReverse;
|
private bool _sortReverse;
|
||||||
private bool _paused;
|
|
||||||
|
|
||||||
[RequiredService]
|
[RequiredService]
|
||||||
private IMemoryDomains MemoryDomains { get; set; }
|
private IMemoryDomains MemoryDomains { get; set; }
|
||||||
|
@ -250,11 +249,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
public void UpdateValues()
|
public void UpdateValues()
|
||||||
{
|
{
|
||||||
if (_paused)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((!IsHandleCreated || IsDisposed) && !Config.DisplayRamWatch)
|
if ((!IsHandleCreated || IsDisposed) && !Config.DisplayRamWatch)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -277,11 +271,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
public void FastUpdate()
|
public void FastUpdate()
|
||||||
{
|
{
|
||||||
if (_paused)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((!IsHandleCreated || IsDisposed) && !Config.DisplayRamWatch)
|
if ((!IsHandleCreated || IsDisposed) && !Config.DisplayRamWatch)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -713,8 +702,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
FreezeAddressMenuItem.Enabled =
|
FreezeAddressMenuItem.Enabled =
|
||||||
SelectedIndices.Any() &&
|
SelectedIndices.Any() &&
|
||||||
SelectedWatches.All(w => w.Domain.Writable);
|
SelectedWatches.All(w => w.Domain.Writable);
|
||||||
|
|
||||||
PauseMenuItem.Text = _paused ? "Unpause" : "Pause";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private MemoryDomain _currentDomain;
|
private MemoryDomain _currentDomain;
|
||||||
|
@ -950,11 +937,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
WatchListView.SelectAll();
|
WatchListView.SelectAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PauseMenuItem_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
_paused ^= true;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Options
|
#region Options
|
||||||
|
|
Loading…
Reference in New Issue