diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index 39ba941d89..0280bce8b9 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -137,7 +137,6 @@ this.CheatListView.UseCompatibleStateImageBehavior = false; this.CheatListView.View = System.Windows.Forms.View.Details; this.CheatListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.CheatListView_ColumnClick); - this.CheatListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.CheatListView_ColumnReordered); this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged); this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click); this.CheatListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewCheatForm_DragDrop); diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 5be986e07d..d509dcb012 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -707,19 +707,6 @@ namespace BizHawk.Client.EmuHawk { "DisplayTypeColumn", 8 }, }; - Global.Config.CheatsColumnIndices = new Dictionary - { - { "NamesColumn", 0 }, - { "AddressColumn", 1 }, - { "ValueColumn", 2 }, - { "CompareColumn", 3 }, - { "OnColumn", 4 }, - { "DomainColumn", 5 }, - { "SizeColumn", 6 }, - { "EndianColumn", 7 }, - { "DisplayTypeColumn", 8 }, - }; - Global.Config.CheatsColumnShow = new Dictionary { { "NamesColumn", true }, @@ -733,8 +720,10 @@ namespace BizHawk.Client.EmuHawk { "DisplayTypeColumn", false }, }; - LoadColumnInfo(); RefreshFloatingWindowControl(); + ColumnPositions(); + LoadColumnInfo(); + } #endregion @@ -808,19 +797,6 @@ namespace BizHawk.Client.EmuHawk DoSelectedIndexChange(); } - private void CheatListView_ColumnReordered(object sender, ColumnReorderedEventArgs e) - { - Global.Config.CheatsColumnIndices[NAME] = CheatListView.Columns[NAME].DisplayIndex; - Global.Config.CheatsColumnIndices[ADDRESS] = CheatListView.Columns[ADDRESS].DisplayIndex; - Global.Config.CheatsColumnIndices[VALUE] = CheatListView.Columns[VALUE].DisplayIndex; - Global.Config.CheatsColumnIndices[COMPARE] = CheatListView.Columns[COMPARE].DisplayIndex; - Global.Config.CheatsColumnIndices[ON] = CheatListView.Columns[ON].DisplayIndex; - Global.Config.CheatsColumnIndices[DOMAIN] = CheatListView.Columns[DOMAIN].DisplayIndex; - Global.Config.CheatsColumnIndices[SIZE] = CheatListView.Columns[SIZE].DisplayIndex; - Global.Config.CheatsColumnIndices[ENDIAN] = CheatListView.Columns[ENDIAN].DisplayIndex; - Global.Config.CheatsColumnIndices[TYPE] = CheatListView.Columns[TYPE].DisplayIndex; - } - private void CheatListView_DoubleClick(object sender, EventArgs e) { ToggleMenuItem_Click(sender, e); diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 45cb1f2396..ee4c756e46 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -1300,16 +1300,23 @@ namespace BizHawk.Client.EmuHawk { Size = new Size(_defaultWidth, _defaultHeight); + Global.Config.RamSearchColumnWidths = new Dictionary + { + { "AddressColumn", -1 }, + { "ValueColumn", -1 }, + { "PrevColumn", -1 }, + { "ChangesColumn", -1 }, + { "DiffColumn", -1 }, + }; + Global.Config.RamSearchColumnIndexes = new Dictionary { - { "AddressColumn", 0 }, - { "ValueColumn", 1 }, - { "PrevColumn", 2 }, - { "ChangesColumn", 3 }, - { "DiffColumn", 4 }, - { "DomainColumn", 5 }, - { "NotesColumn", 6 }, - }; + { "AddressColumn", 0 }, + { "ValueColumn", 1 }, + { "PrevColumn", 2 }, + { "ChangesColumn", 3 }, + { "DiffColumn", 4 }, + }; ColumnPositions(); @@ -1317,10 +1324,6 @@ namespace BizHawk.Client.EmuHawk Global.Config.RamSearchShowPrevColumn = true; Global.Config.RamSearchShowDiffColumn = false; - WatchListView.Columns[WatchList.ADDRESS].Width = _defaultColumnWidths[WatchList.ADDRESS]; - WatchListView.Columns[WatchList.VALUE].Width = _defaultColumnWidths[WatchList.VALUE]; - WatchListView.Columns[WatchList.CHANGES].Width = _defaultColumnWidths[WatchList.CHANGES]; - Global.Config.RamSearchSettings.SaveWindowPosition = true; Global.Config.RamSearchSettings.TopMost = TopMost = false; Global.Config.RamSearchSettings.FloatingWindow = false; @@ -1334,7 +1337,7 @@ namespace BizHawk.Client.EmuHawk { "DiffColumn", -1 }, }; - LoadColumnInfo(); + _settings = new RamSearchEngine.Settings(); if (_settings.Mode == RamSearchEngine.Settings.SearchMode.Fast) @@ -1343,6 +1346,8 @@ namespace BizHawk.Client.EmuHawk } RefreshFloatingWindowControl(); + ColumnPositions(); + LoadColumnInfo(); } #endregion