From 14054c6f1de0dabfc241a707e6890e7e229b81f5 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Wed, 6 Apr 2011 23:25:53 +0000 Subject: [PATCH] A bunch of tool dialogs didn't have the save window position flag hooked up --- BizHawk.MultiClient/NEStools/NESPPU.cs | 2 +- BizHawk.MultiClient/tools/Cheats.cs | 2 +- BizHawk.MultiClient/tools/HexEditor.cs | 2 +- BizHawk.MultiClient/tools/LuaWindow.Designer.cs | 1 + BizHawk.MultiClient/tools/LuaWindow.cs | 5 +++++ BizHawk.MultiClient/tools/RamSearch.cs | 2 +- BizHawk.MultiClient/tools/RamWatch.cs | 2 +- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs index 9ddafd5806..9aaa5f1b2b 100644 --- a/BizHawk.MultiClient/NEStools/NESPPU.cs +++ b/BizHawk.MultiClient/NEStools/NESPPU.cs @@ -49,7 +49,7 @@ namespace BizHawk.MultiClient defaultWidth = Size.Width; //Save these first so that the user can restore to its original size defaultHeight = Size.Height; - if (Global.Config.NESPPUWndx >= 0 && Global.Config.NESPPUWndy >= 0) + if (Global.Config.NESPPUSaveWindowPosition && Global.Config.NESPPUWndx >= 0 && Global.Config.NESPPUWndy >= 0) Location = new Point(Global.Config.NESPPUWndx, Global.Config.NESPPUWndy); } diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index a394be10bc..da3fda099e 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -230,7 +230,7 @@ namespace BizHawk.MultiClient defaultDomainWidth = CheatListView.Columns[3].Width; defaultOnWidth = CheatListView.Columns[4].Width; - if (Global.Config.CheatsWndx >= 0 && Global.Config.CheatsWndy >= 0) + if (Global.Config.CheatsSaveWindowPosition && Global.Config.CheatsWndx >= 0 && Global.Config.CheatsWndy >= 0) Location = new Point(Global.Config.CheatsWndx, Global.Config.CheatsWndy); if (Global.Config.CheatsWidth >= 0 && Global.Config.CheatsHeight >= 0) diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index 5eb1e37502..561399df77 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -52,7 +52,7 @@ namespace BizHawk.MultiClient defaultHeight = this.Size.Height; if (Global.Config.HexEditorSaveWindowPosition) { - if (Global.Config.HexEditorWndx >= 0 && Global.Config.HexEditorWndy >= 0) + if (Global.Config.HexEditorSaveWindowPosition && Global.Config.HexEditorWndx >= 0 && Global.Config.HexEditorWndy >= 0) this.Location = new Point(Global.Config.HexEditorWndx, Global.Config.HexEditorWndy); if (Global.Config.HexEditorWidth >= 0 && Global.Config.HexEditorHeight >= 0) diff --git a/BizHawk.MultiClient/tools/LuaWindow.Designer.cs b/BizHawk.MultiClient/tools/LuaWindow.Designer.cs index 0505263ba0..e97637dc95 100644 --- a/BizHawk.MultiClient/tools/LuaWindow.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaWindow.Designer.cs @@ -126,6 +126,7 @@ this.Controls.Add(this.IDT_SCRIPTFILE); this.Name = "LuaWindow"; this.Text = "Lua Script"; + this.Load += new System.EventHandler(this.LuaWindow_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/BizHawk.MultiClient/tools/LuaWindow.cs b/BizHawk.MultiClient/tools/LuaWindow.cs index 66abcd4761..e1d70b34a6 100644 --- a/BizHawk.MultiClient/tools/LuaWindow.cs +++ b/BizHawk.MultiClient/tools/LuaWindow.cs @@ -45,5 +45,10 @@ namespace BizHawk.MultiClient.tools LuaImp.DoLuaFile(IDT_SCRIPTFILE.Text); } + private void LuaWindow_Load(object sender, EventArgs e) + { + + } + } } diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 44c91a07e7..49828e1597 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -90,7 +90,7 @@ namespace BizHawk.MultiClient littleEndianToolStripMenuItem.Checked = true; } - if (Global.Config.RamSearchWndx >= 0 && Global.Config.RamSearchWndy >= 0) + if (Global.Config.RamSearchSaveWindowPosition && Global.Config.RamSearchWndx >= 0 && Global.Config.RamSearchWndy >= 0) this.Location = new Point(Global.Config.RamSearchWndx, Global.Config.RamSearchWndy); if (Global.Config.RamSearchWidth >= 0 && Global.Config.RamSearchHeight >= 0) diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 13c499c612..549be81898 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -78,7 +78,7 @@ namespace BizHawk.MultiClient defaultChangeWidth = WatchListView.Columns[3].Width; NotesWidth = WatchListView.Columns[4].Width; - if (Global.Config.RamWatchWndx >= 0 && Global.Config.RamWatchWndy >= 0) + if (Global.Config.RamWatchSaveWindowPosition && Global.Config.RamWatchWndx >= 0 && Global.Config.RamWatchWndy >= 0) Location = new Point(Global.Config.RamWatchWndx, Global.Config.RamWatchWndy); if (Global.Config.RamWatchWidth >= 0 && Global.Config.RamWatchHeight >= 0)