From daf6f516c690fea6d7aa950e4bdb6095bb6782fc Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 8 Sep 2020 19:35:42 -0400 Subject: [PATCH] fix bugs from aa1de1c9d23709ba53b6f3b3fffb1499d0f26dab that made tool windows undesignable --- src/BizHawk.Client.EmuHawk/FormBase.cs | 6 +++--- src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/FormBase.cs b/src/BizHawk.Client.EmuHawk/FormBase.cs index cd9fda3d14..d3d67ba35c 100644 --- a/src/BizHawk.Client.EmuHawk/FormBase.cs +++ b/src/BizHawk.Client.EmuHawk/FormBase.cs @@ -21,10 +21,10 @@ namespace BizHawk.Client.EmuHawk set => throw new InvalidOperationException("window title can only be changed by calling " + nameof(UpdateWindowTitle) + " (which calls " + nameof(WindowTitle) + " getter)"); } - protected virtual string WindowTitle => WindowTitleStatic; - + protected virtual string WindowTitle => WindowTitleStatic; + /// To enforce the "static title" semantics for implementations, this getter will be called once and cached. - protected virtual string WindowTitleStatic => throw new NotImplementedException("you have to implement this; the Designer prevents this from being an abstract method"); + protected virtual string WindowTitleStatic => GetType().Name; protected override void OnLoad(EventArgs e) { diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs b/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs index 9d00d8265b..f30f730616 100644 --- a/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs +++ b/src/BizHawk.Client.EmuHawk/tools/ToolFormBase.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public abstract class ToolFormBase : FormBase + public class ToolFormBase : FormBase { public ToolManager Tools { get; set; }