From bcdeec369a9fb4bd0358295bf07dc1b6b2869983 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 23 Apr 2023 17:19:11 +1000 Subject: [PATCH] Move commented-out code to `#if false` --- .../tools/Debugger/GenericDebugger.Designer.cs | 1 - .../tools/Debugger/GenericDebugger.Disassembler.cs | 8 -------- .../tools/Debugger/GenericDebugger.cs | 8 ++++++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index 866c7a2f57..90d95e063c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -221,7 +221,6 @@ namespace BizHawk.Client.EmuHawk this.DisassemblerView.SeekingCutoffInterval = 0; this.DisassemblerView.Size = new System.Drawing.Size(395, 448); this.DisassemblerView.TabIndex = 1; - this.DisassemblerView.RowScroll += new BizHawk.Client.EmuHawk.InputRoll.RowScrollEvent(this.DisassemblerView_Scroll); this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged); this.DisassemblerView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DisassemblerView_KeyDown); // diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs index 80defa3ac5..1a26933c6c 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs @@ -140,14 +140,6 @@ namespace BizHawk.Client.EmuHawk } } -// private bool _blockScroll; - private void DisassemblerView_Scroll(object sender, EventArgs e) - { -// if (_blockScroll) { return; } - - // is this still needed? - } - private void SetDisassemblerItemCount() { if (DisassemblerView.VisibleRows > 0) diff --git a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index 3a44ac7561..be17537f5e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -25,6 +25,14 @@ namespace BizHawk.Client.EmuHawk Icon = ToolIcon; Closing += (o, e) => DisengageDebugger(); +#if false + var blockScroll = false; + DisassemblerView.RowScroll += (_, _) => + { + if (blockScroll) return; + //TODO is this still needed? + }; +#endif DisassemblerView.QueryItemText += DisassemblerView_QueryItemText; DisassemblerView.QueryItemBkColor += DisassemblerView_QueryItemBkColor; DisassemblerView.AllColumns.Clear();