negames/Neg_Utils
26
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better-ui-manager #2

Merged
BitterSmile merged 25 commits from better-ui-manager into main 2023-09-02 14:34:16 +02:00
Conversation 2 Commits 25 Files Changed 93 +11 -11
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15ea7f7328 - Show all commits

2
NEG/UI/IControllable.cs
View File

@ -11,7 +11,7 @@ namespace NegUtils.NEG.UI
event Action<object> OnOpened; event Action<object> OnOpened;
event Action OnClosed; event Action OnClosed;
event Action<BackUsed> UseBack; event Action<BackUsed> OnBackUsed;
public void TryUseBack(ref BackUsed backUsed); public void TryUseBack(ref BackUsed backUsed);
} }

4
NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
View File

@ -9,9 +9,9 @@ namespace NEG.UI.Area
{ {
public class CloseMainWindowOnBack : MonoController 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(); UiManager.Instance.CurrentMainWindow.Close();
backUsed.Used = true; backUsed.Used = true;
} }

4
NEG/UI/UnityUi/Area/MonoArea.cs
View File

@ -14,7 +14,7 @@ namespace NEG.UI.Area
{ {
public event Action<object> OnOpened; public event Action<object> OnOpened;
public event Action OnClosed; public event Action OnClosed;
public event Action<IControllable.BackUsed> UseBack; public event Action<IControllable.BackUsed> OnBackUsed;
public IEnumerable<IWindowSlot> AvailableSlots => windowSlots; public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
public IWindowSlot DefaultWindowSlot => windowSlots[0]; public IWindowSlot DefaultWindowSlot => windowSlots[0];
@ -54,6 +54,6 @@ namespace NEG.UI.Area
UiManager.Instance.CurrentArea = null; UiManager.Instance.CurrentArea = null;
} }
public void TryUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed); public void TryUseBack(ref IControllable.BackUsed backUsed) => OnBackUsed?.Invoke(backUsed);
} }
} }

4
NEG/UI/UnityUi/MonoController.cs
View File

@ -15,7 +15,7 @@ namespace NEG.UI.UnityUi
{ {
controllable.Value.OnOpened += OnOpened; controllable.Value.OnOpened += OnOpened;
controllable.Value.OnClosed += OnClosed; controllable.Value.OnClosed += OnClosed;
controllable.Value.UseBack += UseBack; controllable.Value.OnBackUsed += OnBackUsed;
} }
private void OnValidate() => this.ValidateRefs(); private void OnValidate() => this.ValidateRefs();
@ -24,6 +24,6 @@ namespace NEG.UI.UnityUi
protected virtual void OnClosed() { } protected virtual void OnClosed() { }
protected virtual void UseBack(IControllable.BackUsed obj) { } protected virtual void OnBackUsed(IControllable.BackUsed obj) { }
} }
} }

4
NEG/UI/UnityUi/Window/CloseWindowOnBack.cs
View File

@ -9,9 +9,9 @@ namespace NEG.UI.UnityUi.Window
{ {
[SerializeField, Self(Flag.Editable)] private MonoWindow 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(); window.Close();
backUsed.Used = true; backUsed.Used = true;
} }

4
NEG/UI/UnityUi/Window/MonoWindow.cs
View File

@ -16,7 +16,7 @@ namespace NEG.UI.UnityUi.Window
{ {
public event Action<object> OnOpened; public event Action<object> OnOpened;
public event Action OnClosed; public event Action OnClosed;
public event Action<IControllable.BackUsed> UseBack; public event Action<IControllable.BackUsed> OnBackUsed;
public IEnumerable<IWindowSlot> AvailableSlots => windowSlots; public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
public IWindowSlot Parent { get; private set; } public IWindowSlot Parent { get; private set; }
@ -66,6 +66,6 @@ namespace NEG.UI.UnityUi.Window
public void SetDefaultSelectedItem(GameObject item) => defaultSelectedItem = item; 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);
} }
} }