From c8cd769ec532a4b291b56b2a6616f9d2de8f7c24 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Wed, 11 Aug 2021 02:43:02 +0200 Subject: [PATCH] refactor: OnOpenConfigUi -> OpenConfigUi --- Dalamud.CorePlugin/PluginImpl.cs | 2 +- .../Internal/Windows/PluginInstallerWindow.cs | 2 +- Dalamud/Interface/UiBuilder.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dalamud.CorePlugin/PluginImpl.cs b/Dalamud.CorePlugin/PluginImpl.cs index 348beab88..d00539559 100644 --- a/Dalamud.CorePlugin/PluginImpl.cs +++ b/Dalamud.CorePlugin/PluginImpl.cs @@ -36,7 +36,7 @@ namespace Dalamud.CorePlugin this.windowSystem.AddWindow(new PluginWindow(Dalamud.Instance)); this.Interface.UiBuilder.Draw += this.OnDraw; - this.Interface.UiBuilder.OnOpenConfigUi += this.OnOpenConfigUi; + this.Interface.UiBuilder.OpenConfigUi += this.OnOpenConfigUi; this.Interface.CommandManager.AddHandler("/di", new(this.OnCommand) { HelpMessage = $"Access the {this.Name} plugin." }); } diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index a1c2954e5..9f36843c8 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -1019,7 +1019,7 @@ namespace Dalamud.Interface.Internal.Windows { try { - plugin.DalamudInterface.UiBuilder.OpenConfigUi(); + plugin.DalamudInterface.UiBuilder.OpenConfig(); } catch (Exception ex) { diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs index 27769b74e..f6590009e 100644 --- a/Dalamud/Interface/UiBuilder.cs +++ b/Dalamud/Interface/UiBuilder.cs @@ -47,7 +47,7 @@ namespace Dalamud.Interface /// /// Event that is fired when the plugin should open its configuration interface. /// - public event EventHandler OnOpenConfigUi; + public event EventHandler OpenConfigUi; /// /// Gets the default Dalamud font based on Noto Sans CJK Medium in 17pt - supporting all game languages and icons. @@ -128,7 +128,7 @@ namespace Dalamud.Interface /// /// Gets a value indicating whether this UiBuilder has a configuration UI registered. /// - internal bool HasConfigUi => this.OnOpenConfigUi != null; + internal bool HasConfigUi => this.OpenConfigUi != null; /// /// Gets or sets the time this plugin took to draw on the last frame. @@ -201,9 +201,9 @@ namespace Dalamud.Interface /// /// Open the registered configuration UI, if it exists. /// - internal void OpenConfigUi() + internal void OpenConfig() { - this.OnOpenConfigUi?.Invoke(this, null); + this.OpenConfigUi?.Invoke(this, null); } private void OnDraw() @@ -243,7 +243,7 @@ namespace Dalamud.Interface { Log.Error(ex, "[{0}] UiBuilder OnBuildUi caught exception", this.namespaceName); this.Draw = null; - this.OnOpenConfigUi = null; + this.OpenConfigUi = null; this.hasErrorWindow = true; }