From b3e6d1b49f9a40ca4ddf7bbbe789f6020ca888c3 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 14 Oct 2019 20:39:10 -0500 Subject: [PATCH] Ram Watch - wire up column sorting --- BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs | 3 +-- BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs index da195243d7..efda464bdd 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs @@ -895,8 +895,7 @@ this.WatchListView.Size = new System.Drawing.Size(332, 281); this.WatchListView.TabIndex = 2; this.WatchListView.UseCustomBackground = true; - // InputRoll TODO - //this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick); + this.WatchListView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.WatchListView_ColumnClick); this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged); this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop); this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.DragEnterWrapper); diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index dd4d5fe4cb..68e96c26df 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -553,9 +553,8 @@ namespace BizHawk.Client.EmuHawk } } - private void OrderColumn(int index) + private void OrderColumn(InputRoll.RollColumn column) { - var column = WatchListView.AllColumns[index]; if (column.Name != _sortedColumn) { _sortReverse = false; @@ -1278,7 +1277,7 @@ namespace BizHawk.Client.EmuHawk } // InputRoll TODO - private void WatchListView_ColumnClick(object sender, ColumnClickEventArgs e) + private void WatchListView_ColumnClick(object sender, InputRoll.ColumnClickEventArgs e) { OrderColumn(e.Column); }