From c2bec296e61878e2f5a4c299d94fb6602e041a7d Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 3 Feb 2020 12:42:28 -0600 Subject: [PATCH] simplify some repeated boilerplate on the DragEnter event by consolidating it to an extension method --- BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs | 10 ++++++++++ BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 +- BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs | 2 +- BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs | 7 +++---- BizHawk.Client.EmuHawk/movie/PlayMovie.cs | 4 ++-- BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 2 +- BizHawk.Client.EmuHawk/tools/BatchRun.cs | 4 +--- BizHawk.Client.EmuHawk/tools/CDL.cs | 5 ++--- BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs | 2 +- BizHawk.Client.EmuHawk/tools/ToolFormBase.cs | 2 +- 10 files changed, 23 insertions(+), 17 deletions(-) diff --git a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs index 81ddd448f8..4214c34d4f 100644 --- a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs @@ -248,5 +248,15 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions { return dialogResult == DialogResult.OK; } + + /// + /// Sets the desired effect if data is present, else None + /// + public static void Set(this DragEventArgs e, DragDropEffects effect) + { + e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) + ? effect + : DragDropEffects.None; + } } } diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index 4f4038de0f..c7f0477e07 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -3236,7 +3236,7 @@ namespace BizHawk.Client.EmuHawk private static void FormDragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } private void FormDragDrop(object sender, DragEventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index 67eea8c14f..e6d775fab5 100644 --- a/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -709,7 +709,7 @@ namespace BizHawk.Client.EmuHawk private void lvFirmwares_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } private void lvFirmwares_DragDrop(object sender, DragEventArgs e) diff --git a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs index 644440b49f..deb87f5c15 100644 --- a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs +++ b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using System.IO; using BizHawk.Client.Common; +using BizHawk.Client.EmuHawk.WinFormExtensions; using BizHawk.Emulation.Cores.Nintendo.Gameboy; namespace BizHawk.Client.EmuHawk @@ -337,9 +338,7 @@ namespace BizHawk.Client.EmuHawk private void ColorChooserForm_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) - ? DragDropEffects.Move - : DragDropEffects.None; + e.Set(DragDropEffects.Move); } private void Button7_Click(object sender, EventArgs e) @@ -353,7 +352,7 @@ namespace BizHawk.Client.EmuHawk }; var result = sfd.ShowDialog(this); - if (result == DialogResult.OK) + if (result.IsOk()) { SaveColorFile(sfd.FileName); } diff --git a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs index 97bd32c9da..5ada65c815 100644 --- a/BizHawk.Client.EmuHawk/movie/PlayMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/PlayMovie.cs @@ -289,7 +289,7 @@ namespace BizHawk.Client.EmuHawk #region Movie List - void RefreshMovieList() + private void RefreshMovieList() { MovieView.VirtualListSize = _movieList.Count; UpdateList(); @@ -297,7 +297,7 @@ namespace BizHawk.Client.EmuHawk private void MovieView_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } private void MovieView_DragDrop(object sender, DragEventArgs e) diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs index 3026a99c90..31bcbb20e6 100644 --- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs +++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs @@ -211,7 +211,7 @@ namespace BizHawk.Client.EmuHawk private void RecordBox_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } private void RecordBox_DragDrop(object sender, DragEventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/BatchRun.cs b/BizHawk.Client.EmuHawk/tools/BatchRun.cs index 8485467a90..038256141d 100644 --- a/BizHawk.Client.EmuHawk/tools/BatchRun.cs +++ b/BizHawk.Client.EmuHawk/tools/BatchRun.cs @@ -20,9 +20,7 @@ namespace BizHawk.Client.EmuHawk private void listBox1_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) - ? DragDropEffects.Link - : DragDropEffects.None; + e.Set(DragDropEffects.Link); } private void SetCount() diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs index 3089453155..a1bc552e74 100644 --- a/BizHawk.Client.EmuHawk/tools/CDL.cs +++ b/BizHawk.Client.EmuHawk/tools/CDL.cs @@ -6,6 +6,7 @@ using BizHawk.Emulation.Common; using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.ToolExtensions; +using BizHawk.Client.EmuHawk.WinFormExtensions; //TODO - select which memorydomains go out to the CDL file. will this cause a problem when re-importing it? //perhaps missing domains shouldnt fail a check @@ -527,7 +528,7 @@ namespace BizHawk.Client.EmuHawk private void CDL_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } private void CDL_DragDrop(object sender, DragEventArgs e) @@ -539,8 +540,6 @@ namespace BizHawk.Client.EmuHawk } } - - private void tsbViewStyle_SelectedIndexChanged(object sender, EventArgs e) { UpdateDisplay(true); diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index 3ff3a2465d..48175e433b 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -682,7 +682,7 @@ namespace BizHawk.Client.EmuHawk private void NewCheatForm_DragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } private void CheatsContextMenu_Opening(object sender, CancelEventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs b/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs index 059b6f71e0..26b05d9800 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs @@ -86,7 +86,7 @@ namespace BizHawk.Client.EmuHawk protected void GenericDragEnter(object sender, DragEventArgs e) { - e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; + e.Set(DragDropEffects.Copy); } protected void RefreshFloatingWindowControl(bool floatingWindow)