diff --git a/NEG/UI/IControllable.cs b/NEG/UI/IControllable.cs index 9fbc5e1..b821427 100644 --- a/NEG/UI/IControllable.cs +++ b/NEG/UI/IControllable.cs @@ -11,7 +11,7 @@ namespace NegUtils.NEG.UI event Action OnOpened; event Action OnClosed; - event Action UseBack; + event Action OnBackUsed; public void TryUseBack(ref BackUsed backUsed); } diff --git a/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs index feb80a7..1334558 100644 --- a/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs +++ b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs @@ -9,9 +9,9 @@ namespace NEG.UI.Area { public class CloseMainWindowOnBack : MonoController { - protected override void UseBack(IControllable.BackUsed backUsed) + protected override void OnBackUsed(IControllable.BackUsed backUsed) { - base.UseBack(backUsed); + base.OnBackUsed(backUsed); UiManager.Instance.CurrentMainWindow.Close(); backUsed.Used = true; } diff --git a/NEG/UI/UnityUi/Area/MonoArea.cs b/NEG/UI/UnityUi/Area/MonoArea.cs index f6d2d6f..2829582 100644 --- a/NEG/UI/UnityUi/Area/MonoArea.cs +++ b/NEG/UI/UnityUi/Area/MonoArea.cs @@ -14,7 +14,7 @@ namespace NEG.UI.Area { public event Action OnOpened; public event Action OnClosed; - public event Action UseBack; + public event Action OnBackUsed; public IEnumerable AvailableSlots => windowSlots; public IWindowSlot DefaultWindowSlot => windowSlots[0]; @@ -54,6 +54,6 @@ namespace NEG.UI.Area UiManager.Instance.CurrentArea = null; } - public void TryUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed); + public void TryUseBack(ref IControllable.BackUsed backUsed) => OnBackUsed?.Invoke(backUsed); } } \ No newline at end of file diff --git a/NEG/UI/UnityUi/MonoController.cs b/NEG/UI/UnityUi/MonoController.cs index 79d538a..7c4afdb 100644 --- a/NEG/UI/UnityUi/MonoController.cs +++ b/NEG/UI/UnityUi/MonoController.cs @@ -15,7 +15,7 @@ namespace NEG.UI.UnityUi { controllable.Value.OnOpened += OnOpened; controllable.Value.OnClosed += OnClosed; - controllable.Value.UseBack += UseBack; + controllable.Value.OnBackUsed += OnBackUsed; } private void OnValidate() => this.ValidateRefs(); @@ -24,6 +24,6 @@ namespace NEG.UI.UnityUi protected virtual void OnClosed() { } - protected virtual void UseBack(IControllable.BackUsed obj) { } + protected virtual void OnBackUsed(IControllable.BackUsed obj) { } } } \ No newline at end of file diff --git a/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs index bdc9bef..29b0893 100644 --- a/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs +++ b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs @@ -9,9 +9,9 @@ namespace NEG.UI.UnityUi.Window { [SerializeField, Self(Flag.Editable)] private MonoWindow window; - protected override void UseBack(IControllable.BackUsed backUsed) + protected override void OnBackUsed(IControllable.BackUsed backUsed) { - base.UseBack(backUsed); + base.OnBackUsed(backUsed); window.Close(); backUsed.Used = true; } diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs index b9b400d..ddbc35a 100644 --- a/NEG/UI/UnityUi/Window/MonoWindow.cs +++ b/NEG/UI/UnityUi/Window/MonoWindow.cs @@ -16,7 +16,7 @@ namespace NEG.UI.UnityUi.Window { public event Action OnOpened; public event Action OnClosed; - public event Action UseBack; + public event Action OnBackUsed; public IEnumerable AvailableSlots => windowSlots; public IWindowSlot Parent { get; private set; } @@ -66,6 +66,6 @@ namespace NEG.UI.UnityUi.Window public void SetDefaultSelectedItem(GameObject item) => defaultSelectedItem = item; - public void TryUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed); + public void TryUseBack(ref IControllable.BackUsed backUsed) => OnBackUsed?.Invoke(backUsed); } } \ No newline at end of file