From 6c19b566d04f73cdc27fef42a7ca392433ae6665 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sat, 26 Nov 2022 19:24:00 +0100
Subject: [PATCH 01/20] test of assembly definition

---
 .../MultiSelectChips/MultiSelectChips.cs      |  4 +--
 UiToolkit/NEG_UiToolkit.asmdef                | 28 +++++++++++++++++++
 UiToolkit/NEG_UiToolkit.asmdef.meta           |  7 +++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 UiToolkit/NEG_UiToolkit.asmdef
 create mode 100644 UiToolkit/NEG_UiToolkit.asmdef.meta

diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.cs b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
index aee960e..0d14905 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChips.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
@@ -1,11 +1,11 @@
 #if ADDRESSABLES && UI_ELEMENTS
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
 using System;
 using System.Collections;
 using System.ComponentModel;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
 
 public class MultiSelectChips : VisualElement
 {
diff --git a/UiToolkit/NEG_UiToolkit.asmdef b/UiToolkit/NEG_UiToolkit.asmdef
new file mode 100644
index 0000000..ed497ad
--- /dev/null
+++ b/UiToolkit/NEG_UiToolkit.asmdef
@@ -0,0 +1,28 @@
+{
+    "name": "NEG_UiToolkit",
+    "rootNamespace": "",
+    "references": [
+        "Unity.Addressables",
+        "Unity.ResourceManager"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.addressables",
+            "expression": "",
+            "define": "ADDRESSABLES"
+        },
+        {
+            "name": "com.unity.modules.uielements",
+            "expression": "",
+            "define": "UI_ELEMENTS"
+        }
+    ],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/UiToolkit/NEG_UiToolkit.asmdef.meta b/UiToolkit/NEG_UiToolkit.asmdef.meta
new file mode 100644
index 0000000..dcbd343
--- /dev/null
+++ b/UiToolkit/NEG_UiToolkit.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7ff6afcd64a25ab4497e324400b59140
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From 9647327168579498d7448b02735b3e84a11a4c6e Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Mon, 12 Dec 2022 19:22:13 +0100
Subject: [PATCH 02/20] multi chip update

---
 .../MultiSelectChips/IMultiSelectChipItem.cs  |  11 +
 .../IMultiSelectChipItem.cs.meta              |  11 +
 .../MultiSelectChips/MultiSelectChipItem.cs   |  24 ++
 .../MultiSelectChipItem.cs.meta               |  11 +
 .../MultiSelectChips/MultiSelectChipItem.uxml |   7 +
 .../MultiSelectChipItem.uxml.meta             |  10 +
 .../MultiSelectChips/MultiSelectChips.cs      | 252 +++++++++++-------
 .../MultiSelectChips/MultiSelectChips.uxml    |   1 -
 8 files changed, 232 insertions(+), 95 deletions(-)
 create mode 100644 UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs
 create mode 100644 UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs.meta
 create mode 100644 UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
 create mode 100644 UiToolkit/MultiSelectChips/MultiSelectChipItem.cs.meta
 create mode 100644 UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml
 create mode 100644 UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta

diff --git a/UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs b/UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs
new file mode 100644
index 0000000..d2c3b0f
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using UnityEngine;
+
+namespace NEG.Utils.UiToolkits
+{
+    public interface IMultiSelectChipItem
+    {
+        string Name { get; }
+        Color Color { get; }
+    }
+}
\ No newline at end of file
diff --git a/UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs.meta b/UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs.meta
new file mode 100644
index 0000000..2aa4bcd
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/IMultiSelectChipItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f032e3d346d243d458c929d4046f0a1e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
new file mode 100644
index 0000000..84d795b
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
@@ -0,0 +1,24 @@
+using System.Collections;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace NEG.Utils.UiToolkits
+{
+    public class MultiSelectChipItem
+    {
+        public VisualElement VisualElement { get; }    
+        public IMultiSelectChipItem ChipItem { get; }
+
+        private readonly MultiSelectChips parent;
+
+        public MultiSelectChipItem(VisualElement visualElement, IMultiSelectChipItem element, MultiSelectChips multiSelectChips) 
+        { 
+            VisualElement = visualElement;
+            ChipItem = element;
+            parent = multiSelectChips;
+            visualElement.Q<Label>("Name").text = element.Name;
+            visualElement.Q<VisualElement>("Color").style.backgroundColor = element.Color;
+            visualElement.Q<Button>("RemoveBtn").clicked += () => parent.TryRemoveItem(element);
+        }
+    }
+}
\ No newline at end of file
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs.meta b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs.meta
new file mode 100644
index 0000000..a2e10eb
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1906fa5e31f79fe48a6edda94b9c1b4d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml b/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml
new file mode 100644
index 0000000..cec9a30
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml
@@ -0,0 +1,7 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:VisualElement name="VisualElement" class="unity-button" style="min-height: 21px; flex-shrink: 1; flex-direction: row; flex-wrap: wrap; align-items: center;">
+        <ui:VisualElement name="Color" style="min-height: 15px; min-width: 15px; border-top-left-radius: 22px; border-bottom-left-radius: 22px; border-top-right-radius: 22px; border-bottom-right-radius: 22px; border-left-width: 0; border-right-width: 0; border-top-width: 0; border-bottom-width: 0; border-left-color: rgba(0, 0, 125, 255); border-right-color: rgba(0, 0, 125, 255); border-top-color: rgba(0, 0, 125, 255); border-bottom-color: rgba(0, 0, 125, 255); background-color: rgba(255, 0, 0, 255); max-height: 15px; justify-content: center; align-items: center;" />
+        <ui:Label text="Name" display-tooltip-when-elided="true" name="Name" style="padding-left: 7px; padding-right: 5px;" />
+        <ui:Button text="X" display-tooltip-when-elided="true" name="RemoveBtn" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta b/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta
new file mode 100644
index 0000000..4db563d
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 7e7a545b35ac90447adefa27e61dc82b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.cs b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
index 0d14905..6d63099 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChips.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
@@ -1,126 +1,190 @@
 #if ADDRESSABLES && UI_ELEMENTS
 using UnityEngine;
 using UnityEngine.UIElements;
-using System;
-using System.Collections;
-using System.ComponentModel;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
+using System.Collections.Generic;
+using System;
+using System.IO;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 
-public class MultiSelectChips : VisualElement
+namespace NEG.Utils.UiToolkits
 {
-    public string LabelText
+    public class MultiSelectChips : VisualElement
     {
-        get => label.text;
-        set
+        public event Action<IMultiSelectChipItem> OnTryingToRemoveItem;
+        public event Action<Rect> OnTryingToAddItem;
+
+        public string LabelText
         {
-            if (!string.IsNullOrEmpty(value))
+            get => label.text;
+            set
             {
-                if (label == null)
+                if (!string.IsNullOrEmpty(value))
                 {
-                    InitLabel();
+                    if (label == null)
+                    {
+                        InitLabel();
+                    }
+
+                    label.text = value;
+                }
+                else if (label != null)
+                {
+                    label.RemoveFromHierarchy();
+                    label = null;
                 }
-
-                label.text = value;
-            }
-            else if (label != null)
-            {
-                label.RemoveFromHierarchy();
-                label = null;
             }
         }
-    }
 
-    public IList ItemsSource
-    {
-        get => itemsSource;
-
-        set
+        public ICollection<IMultiSelectChipItem> ItemsSource
         {
-            itemsSource = value;
-            UpdateItems();
-        }      
-    }
+            get => itemsSource;
 
-    private Label label;
-    private AsyncOperationHandle<VisualTreeAsset> uxmlHandle, itemUxmlHandle;
-
-    private VisualTreeAsset itemPrefab;
-
-    private IList itemsSource;
-
-    public new class UxmlFactory : UxmlFactory<MultiSelectChips, UxmlTraits>
-    {
-
-    }
-
-    public new class UxmlTraits : VisualElement.UxmlTraits
-    {
-        private readonly UxmlStringAttributeDescription label;
-
-        public UxmlTraits()
-        {
-            label = new()
+            set
             {
-                name = "label"
+                itemsSource = value;
+                UpdateItems();
+            }
+        }
+
+        private Label label;
+        private AsyncOperationHandle<VisualTreeAsset> uxmlHandle, itemUxmlHandle;
+
+        private VisualTreeAsset itemPrefab;
+
+        private ICollection<IMultiSelectChipItem> itemsSource;
+
+        private readonly List<MultiSelectChipItem> spawnedItems = new();
+
+        private VisualElement realItemsParent;
+
+        public new class UxmlFactory : UxmlFactory<MultiSelectChips, UxmlTraits>
+        {
+
+        }
+
+        public new class UxmlTraits : VisualElement.UxmlTraits
+        {
+            private readonly UxmlStringAttributeDescription label;
+
+            public UxmlTraits()
+            {
+                label = new()
+                {
+                    name = "label"
+                };
+            }
+
+            public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+            {
+                base.Init(ve, bag, cc);
+                ((MultiSelectChips)ve).LabelText = label.GetValueFromBag(bag, cc);
+            }
+        }
+
+        public MultiSelectChips() : base()
+        {
+#if UNITY_EDITOR
+            string path = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets($"t:Script {nameof(MultiSelectChips)}")[0]);
+            path = path.Remove(path.LastIndexOf('/'));
+
+            SetVisuals(AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/MultiSelectChips.uxml"));
+            itemPrefab = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/MultiSelectChipItem.uxml");
+#else
+            uxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChips.uxml");
+            itemUxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChipItem.uxml");
+            uxmlHandle.Completed += OnUxmlLoaded;
+            itemUxmlHandle.Completed += OnItemUxmlLoaded;
+#endif
+        }
+
+        public void UpdateItems()
+        {
+            if (itemPrefab == null || itemsSource == null || realItemsParent == null)
+                return;
+
+            List<MultiSelectChipItem> itemsToDestroy = new List<MultiSelectChipItem>(spawnedItems);
+
+            itemsToDestroy.RemoveAll((x) => itemsSource.Contains(x.ChipItem));
+
+            foreach (var item in itemsToDestroy)
+            {
+                realItemsParent.Remove(item.VisualElement);
+                spawnedItems.Remove(item);
+            }
+
+            List<IMultiSelectChipItem> itemsToAdd = new(itemsSource);
+
+            foreach (var item in spawnedItems)
+            {
+                if (itemsToAdd.Contains(item.ChipItem))
+                    itemsToAdd.Remove(item.ChipItem);
+            }
+
+            foreach (var item in itemsToAdd)
+            {
+                VisualElement chipItemVisuals = itemPrefab.Instantiate();
+                realItemsParent.Insert(0, chipItemVisuals);
+                spawnedItems.Add(new MultiSelectChipItem(chipItemVisuals, item, this));
+            }
+        }
+
+        public void TryRemoveItem(IMultiSelectChipItem item)
+        {
+            OnTryingToRemoveItem?.Invoke(item);
+        }
+
+        private void InitLabel()
+        {
+            label = new Label()
+            {
+                pickingMode = PickingMode.Ignore
             };
+            Insert(0, label);
         }
 
-        public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
+        private void OnUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
         {
-            base.Init(ve, bag, cc);
-            ((MultiSelectChips)ve).LabelText = label.GetValueFromBag(bag, cc);
+            if (operation.Status == AsyncOperationStatus.Succeeded)
+            {
+                SetVisuals(operation.Result);
+                Addressables.Release(uxmlHandle);
+                UpdateItems();
+            }
+            else
+            {
+                Debug.LogError($"Asset failed to load.");
+            }
         }
-    }
 
-    public MultiSelectChips() : base()
-    {
-        uxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChips.uxml");
-        itemUxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChipsItem.uxml");
-        uxmlHandle.Completed += OnUxmlLoaded;
-        itemUxmlHandle.Completed += OnItemUxmlLoaded;
-    }
-
-    public void UpdateItems()
-    {
-        if (itemPrefab == null)
-            return;
-    }
-
-    private void InitLabel()
-    {
-        label = new Label()
+        private void OnItemUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
         {
-            pickingMode = PickingMode.Ignore
-        };
-        Add(label);
-    }
 
-    private void OnUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
-    {
-        if (operation.Status == AsyncOperationStatus.Succeeded)
-        {
-            Add(operation.Result.Instantiate());
-            Addressables.Release(uxmlHandle);
+            if (operation.Status == AsyncOperationStatus.Succeeded)
+            {
+                itemPrefab = operation.Result;
+                Addressables.Release(itemUxmlHandle);
+                UpdateItems();
+            }
+            else
+            {
+                Debug.LogError($"Asset failed to load.");
+            }
         }
-        else
-        {
-            Debug.LogError($"Asset failed to load.");
-        }
-    }
 
-    private void OnItemUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
-    {
+        private void SetVisuals(VisualTreeAsset treeAsset)
+        {
+            realItemsParent = treeAsset.Instantiate();
+            Add(realItemsParent);
 
-        if (operation.Status == AsyncOperationStatus.Succeeded)
-        {
-            itemPrefab = operation.Result;
-            Addressables.Release(itemUxmlHandle);
-            UpdateItems();
-        }
-        else
-        {
-            Debug.LogError($"Asset failed to load.");
+            var button = realItemsParent.Q<Button>("AddItem");
+
+            button.clicked += () => OnTryingToAddItem?.Invoke(button.worldBound);
+
+            realItemsParent = button.parent;
         }
     }
 }
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.uxml b/UiToolkit/MultiSelectChips/MultiSelectChips.uxml
index 1a24e53..59469c0 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChips.uxml
+++ b/UiToolkit/MultiSelectChips/MultiSelectChips.uxml
@@ -1,5 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:ListView focusable="true" show-add-remove-footer="false" horizontal-scrolling="true" />
     <ui:VisualElement style="flex-direction: row; flex-wrap: wrap;">
         <ui:Button text="+" display-tooltip-when-elided="true" name="AddItem" />
     </ui:VisualElement>

From 055df4e42719fa348140575f79fa9415716ce681 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Mon, 9 Jan 2023 17:08:54 +0100
Subject: [PATCH 03/20] fix compile error

---
 Timing/TimeMachine.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Timing/TimeMachine.cs b/Timing/TimeMachine.cs
index 02cc9bf..d80ed00 100644
--- a/Timing/TimeMachine.cs
+++ b/Timing/TimeMachine.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEngine;
 
 namespace NEG.Utils.Timing
 {
@@ -27,7 +28,7 @@ namespace NEG.Utils.Timing
         /// <returns>Amount of time retrievend</returns>
         public double Retrieve(double maxTime) 
         {
-            if(!Double.IsFinite(maxTime))
+            if(!double.IsFinite(maxTime))
             {
                 double timeRetrieved = time;
                 time = 0;
@@ -61,7 +62,7 @@ namespace NEG.Utils.Timing
         /// <returns>Amount of warps</returns>
         public int RetrieveAll(double interval, int limit = int.MaxValue)
         {
-            int result = Mathf.FloorToInt(time / interval);
+            int result = Mathf.FloorToInt((float)(time / interval));
             result = Math.Clamp(result, 0, limit);
             time -= result * interval;
             return result;

From 7aecbeb2401ae6d2782e961ebaf0958f2834c2dc Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sun, 14 May 2023 01:04:34 +0200
Subject: [PATCH 04/20] ui system improved

---
 KeyBasedFactory.cs                            |  54 ++++++++++
 KeyBasedFactory.cs.meta                       |   3 +
 NEG/UI/NEG.UI.asmdef                          |   2 +-
 NEG/UI/UiManager.cs                           |   1 +
 NEG/UI/UnityUi/Buttons/BaseButton.cs          | 100 +++++++++++-------
 NEG/UI/UnityUi/Buttons/BaseButton.cs.meta     |  10 +-
 .../UnityUi/Buttons/ButtonSerializeFields.cs  |  33 ------
 .../Buttons/ButtonSerializeFields.cs.meta     |   3 -
 NEG/UI/UnityUi/Buttons/Overrides.meta         |   3 +
 NEG/UI/UnityUi/Buttons/Reaction.meta          |   3 +
 .../Reaction/ButtonElementBehaviour.cs        |  22 ++++
 .../Reaction/ButtonElementBehaviour.cs.meta   |   3 +
 .../Reaction/ChangeTextColorBehaviour.cs      |  46 ++++++++
 .../Reaction/ChangeTextColorBehaviour.cs.meta |   3 +
 .../Buttons/Reaction/SimpleSoundBehaviour.cs  |  24 +++++
 .../Reaction/SimpleSoundBehaviour.cs.meta     |   3 +
 NEG/UI/UnityUi/Buttons/Settings.meta          |   3 +
 .../Buttons/Settings/ButtonSettings.cs        |  32 ++++++
 .../Buttons/Settings/ButtonSettings.cs.meta   |   3 +
 NEG/UI/UnityUi/Buttons/Settings/ColorData.cs  |  10 ++
 .../Buttons/Settings/ColorData.cs.meta        |   3 +
 .../UnityUi/Buttons/Settings/FmodSoundData.cs |  14 +++
 .../Buttons/Settings/FmodSoundData.cs.meta    |   3 +
 .../UnityUi/Buttons/Settings/RemoveFeature.cs |   7 ++
 .../Buttons/Settings/RemoveFeature.cs.meta    |   3 +
 .../UnityUi/Buttons/Settings/SettingData.cs   |  28 +++++
 .../Buttons/Settings/SettingData.cs.meta      |   3 +
 NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs |  10 ++
 .../Buttons/Settings/SpriteData.cs.meta       |   3 +
 NEG/UI/UnityUi/MonoUiInputManger.cs           |  82 ++++++++++++++
 NEG/UI/UnityUi/MonoUiInputManger.cs.meta      |   3 +
 NEG/UI/UnityUi/MonoUiManager.cs               |  44 +++++---
 NEG/UI/UnityUi/NEG.UI.UnityUi.asmdef          |   7 +-
 NEG/UI/UnityUi/SilentEventData.cs             |  11 ++
 NEG/UI/UnityUi/SilentEventData.cs.meta        |   3 +
 NEG/UI/UnityUi/Window/MonoWindow.cs           |   4 +
 NEG/UI/WindowSlot/IWindowSlot.cs              |   2 +-
 RequireInterfaceAttribute.cs                  |   2 +-
 Timing/AutoTimeMachine.cs                     |   8 +-
 Timing/TimeMachine.cs                         |  37 +++----
 40 files changed, 519 insertions(+), 119 deletions(-)
 create mode 100644 KeyBasedFactory.cs
 create mode 100644 KeyBasedFactory.cs.meta
 delete mode 100644 NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs
 delete mode 100644 NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Overrides.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/ColorData.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/ColorData.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/SettingData.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/SettingData.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs.meta
 create mode 100644 NEG/UI/UnityUi/MonoUiInputManger.cs
 create mode 100644 NEG/UI/UnityUi/MonoUiInputManger.cs.meta
 create mode 100644 NEG/UI/UnityUi/SilentEventData.cs
 create mode 100644 NEG/UI/UnityUi/SilentEventData.cs.meta

diff --git a/KeyBasedFactory.cs b/KeyBasedFactory.cs
new file mode 100644
index 0000000..c4d4d5f
--- /dev/null
+++ b/KeyBasedFactory.cs
@@ -0,0 +1,54 @@
+using JetBrains.Annotations;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace NEG.Utils
+{
+    public class KeyBasedFactory<T1, T2>
+    {
+        [PublicAPI]
+        protected Dictionary<T1, Type> data;
+
+        public KeyBasedFactory()
+        {
+            data = new Dictionary<T1, Type>();
+        }
+
+        public void FireRegistration()
+        {
+            ScanAssembly(typeof(T2).Assembly);
+            
+            if(typeof(T2).Assembly.GetType().Assembly == typeof(T2).Assembly)
+                return;
+            
+            ScanAssembly(typeof(T2).Assembly.GetType().Assembly);
+        }
+
+        private static void ScanAssembly(Assembly assembly)
+        {
+            foreach (var type in assembly.GetTypes())
+            {
+                var methodFields =
+                    type.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
+                for (int i = 0; i < methodFields.Length; i++)
+                {
+                    if (Attribute.GetCustomAttribute(methodFields[i], typeof(FactoryRegistration)) != null)
+                    {
+                        methodFields[i].Invoke(null, Array.Empty<object>());
+                    }
+                }
+            }
+        }
+
+        public void Register(T1 key, Type type) => data.Add(key, type);
+
+        public T2 CreateInstance(T1 key, params object[] args) => (T2)Activator.CreateInstance(data[key], args);
+    }
+
+    [AttributeUsage(AttributeTargets.Method)]
+    public class FactoryRegistration : Attribute
+    {
+        public FactoryRegistration() { }
+    }
+}
\ No newline at end of file
diff --git a/KeyBasedFactory.cs.meta b/KeyBasedFactory.cs.meta
new file mode 100644
index 0000000..1c03d8f
--- /dev/null
+++ b/KeyBasedFactory.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2e0d3df1ddd34209bfb7262b4e51abfe
+timeCreated: 1683917310
\ No newline at end of file
diff --git a/NEG/UI/NEG.UI.asmdef b/NEG/UI/NEG.UI.asmdef
index db95a9f..62f697c 100644
--- a/NEG/UI/NEG.UI.asmdef
+++ b/NEG/UI/NEG.UI.asmdef
@@ -1,7 +1,7 @@
 {
     "name": "NEG.UI",
     "rootNamespace": "",
-    "references": [],
+    "references": ["GUID:3c4294719a93e3c4e831a9ff0c261e8a"],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
diff --git a/NEG/UI/UiManager.cs b/NEG/UI/UiManager.cs
index 028a212..f145012 100644
--- a/NEG/UI/UiManager.cs
+++ b/NEG/UI/UiManager.cs
@@ -2,6 +2,7 @@ using JetBrains.Annotations;
 using NEG.UI.Area;
 using NEG.UI.Popup;
 using NEG.UI.Window;
+using NEG.Utils;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/NEG/UI/UnityUi/Buttons/BaseButton.cs b/NEG/UI/UnityUi/Buttons/BaseButton.cs
index 35dfbe9..2d5234f 100644
--- a/NEG/UI/UnityUi/Buttons/BaseButton.cs
+++ b/NEG/UI/UnityUi/Buttons/BaseButton.cs
@@ -1,72 +1,92 @@
-using FMOD.Studio;
-using FMODUnity;
+using KBCore.Refs;
+using NEG.UI.UnityUi.Buttons.Reaction;
+using NEG.UI.UnityUi.Buttons.Settings;
 using System;
+using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.Serialization;
 using UnityEngine.UI;
 
 namespace NEG.UI.UnityUi.Buttons
 {
-    [RequireComponent(typeof(ButtonSerializeFields))]
+    [DefaultExecutionOrder(-1)]
+    [RequireComponent(typeof(Button))]
     public class BaseButton : MonoBehaviour, ISelectHandler, IDeselectHandler, IPointerEnterHandler, IPointerExitHandler
     {
+        public delegate void SelectionHandler(bool isSilent);
+        /// <summary>
+        /// is silent
+        /// </summary>
+        public event SelectionHandler OnSelected;
+        public event SelectionHandler OnDeselected;
         public event Action OnButtonPressed;
-        
-        public bool Interactable { get => serializeFields.Button.interactable; set => serializeFields.Button.interactable = value; }
-        
-        [SerializeField]
-        protected ButtonSerializeFields serializeFields;
+
+        public bool Interactable { get => button.interactable; set => button.interactable = value; }
+
+        public TMP_Text Text => text;
 
         private bool isHovered;
 
-        public virtual void OnSelect(BaseEventData eventData)
-        {
-            if (serializeFields.Text)
-                serializeFields.Text.color = serializeFields.SelectedTextColor;
-        }
+        [SerializeField, Self] private Button button;
+        [SerializeField, Child(Flag.Optional)] private TMP_Text text;
+        [SerializeField, Child(Flag.Optional)] private Image icon;
 
-        public void OnDeselect(BaseEventData eventData)
-        {
-            if (serializeFields.Text)
-                serializeFields.Text.color = serializeFields.DeselectedTextColor;
-        }
+        [SerializeField] private ButtonSettings groupButtonSettings;
+        //[SerializeField, Self(Flag.Optional)] private ButtonSettingOverride overrideSettings;
 
-        public void OnPointerEnter(PointerEventData eventData)
-        {
-            isHovered = true;
-            if (serializeFields.Text)
-                serializeFields.Text.color = serializeFields.SelectedTextColor;
-        }
+        private Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>();
+
+        public virtual void OnSelect(BaseEventData eventData) => OnSelected?.Invoke(eventData is SilentEventData);
+        
+        public void OnDeselect(BaseEventData eventData) => OnDeselected?.Invoke(eventData is SilentEventData);
+
+        public void OnPointerEnter(PointerEventData eventData) => EventSystem.current.SetSelectedGameObject(gameObject);
 
         public void OnPointerExit(PointerEventData eventData)
         {
-            isHovered = false;
-            if (serializeFields.Text)
-                serializeFields.Text.color = serializeFields.DeselectedTextColor;
+            if(EventSystem.current.currentSelectedGameObject == gameObject)
+                EventSystem.current.SetSelectedGameObject(null);
         }
 
-        public void SetText(string text)
+        public void SetText(string txt)
         {
-            if(serializeFields == null)
+            if(text == null)
                 return;
-            if(serializeFields.Text == null)
+            text.text = txt;
+        }
+
+        public void AddOrOverrideSetting(SettingData data)
+        {
+            if (behaviours.TryGetValue(data.Key, out var setting))
+            {
+                setting.ChangeData(data);
                 return;
-            serializeFields.Text.text = text;
+            }
+            behaviours.Add("ChangeTextColor", MonoUiManager.Instance.BehavioursFactory.CreateInstance(data.Key, this, data));
+        }
+
+        public void RemoveSetting(string key)
+        {
+            if (!behaviours.TryGetValue(key, out var setting))
+            {
+                Debug.LogError($"Behaviour with key {key} was not found");
+                return;
+            }
+            setting.Dispose();
+            behaviours.Remove(key);
         }
 
         protected virtual void Awake()
         {
-            if(serializeFields == null)
-                serializeFields = GetComponent<ButtonSerializeFields>();
-            serializeFields.Button.onClick.AddListener(OnClicked);
-            OnDeselect(null);
+            button.onClick.AddListener(OnClicked);
+            groupButtonSettings.Apply(this);
         }
 
-        private void OnValidate()
-        {
-            if(serializeFields == null)
-                serializeFields = GetComponent<ButtonSerializeFields>();
-        }
+        private void Start() => OnDeselect(null);
+
+        private void OnValidate() => this.ValidateRefs();
 
         protected virtual void OnClicked()
         {
diff --git a/NEG/UI/UnityUi/Buttons/BaseButton.cs.meta b/NEG/UI/UnityUi/Buttons/BaseButton.cs.meta
index ea42d55..5a38446 100644
--- a/NEG/UI/UnityUi/Buttons/BaseButton.cs.meta
+++ b/NEG/UI/UnityUi/Buttons/BaseButton.cs.meta
@@ -1,3 +1,11 @@
 fileFormatVersion: 2
 guid: 3a250ef2d0c34e7396a16fc5eddbdb01
-timeCreated: 1670777213
\ No newline at end of file
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: -1
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs b/NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs
deleted file mode 100644
index 60e93a9..0000000
--- a/NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using FMODUnity;
-using System;
-using TMPro;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace NEG.UI.UnityUi.Buttons
-{
-    public class ButtonSerializeFields : MonoBehaviour
-    {
-        [field: SerializeField]
-        public Button Button { get; private set; }
-        [field: SerializeField]
-        public TMP_Text Text { get; private set; }
-        [field: SerializeField]
-        public Color SelectedTextColor { get; private set; }
-        [field: SerializeField]
-        public Color DeselectedTextColor { get; private set; }
-        [field: SerializeField]
-        public EventReference HoverEventRef { get; private set; }
-        [field: SerializeField]
-        public EventReference ClickEventRef { get; private set; }
-
-        private void OnValidate()
-        {
-            if(Button == null)
-                Button = GetComponent<Button>();
-            if (Text == null)
-                Text = GetComponentInChildren<TMP_Text>();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs.meta b/NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs.meta
deleted file mode 100644
index 4cc6cfd..0000000
--- a/NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3f8c6cf4cf18463c86ec1165c61c79b2
-timeCreated: 1670777232
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Overrides.meta b/NEG/UI/UnityUi/Buttons/Overrides.meta
new file mode 100644
index 0000000..36b4ab2
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Overrides.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c431f6df68cb4163b9764b6a87abd31a
+timeCreated: 1683915618
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction.meta b/NEG/UI/UnityUi/Buttons/Reaction.meta
new file mode 100644
index 0000000..0c789ee
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 953c3353e3af44258625fe607ede632b
+timeCreated: 1683915598
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs b/NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs
new file mode 100644
index 0000000..7d2f96a
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs
@@ -0,0 +1,22 @@
+using NEG.UI.UnityUi.Buttons.Settings;
+using System;
+using UnityEngine.EventSystems;
+
+namespace NEG.UI.UnityUi.Buttons.Reaction
+{
+    public abstract class ButtonElementBehaviour : IDisposable
+    {
+        protected SettingData baseData;
+        protected readonly BaseButton button;
+        
+        public ButtonElementBehaviour(BaseButton baseButton, SettingData settingData)
+        {
+            button = baseButton;
+            baseData = settingData;
+        }
+
+        public virtual void ChangeData(SettingData newData) => baseData = newData;
+        
+        public abstract void Dispose();
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs.meta b/NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs.meta
new file mode 100644
index 0000000..1d19cfd
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction/ButtonElementBehaviour.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a5e3decad6424cb288eff3e6f7e0d28e
+timeCreated: 1683919740
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs b/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs
new file mode 100644
index 0000000..bd18235
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs
@@ -0,0 +1,46 @@
+using NEG.UI.UnityUi.Buttons.Settings;
+using NEG.Utils;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace NEG.UI.UnityUi.Buttons.Reaction
+{
+    public class ChangeTextColorBehaviour : ButtonElementBehaviour
+    {
+        private ColorData data;
+        
+        public ChangeTextColorBehaviour(BaseButton baseButton, ColorData data) : base(baseButton, data)
+        {
+            if (baseButton.Text == null)
+            {
+                Debug.LogError("Button without text was provided");
+                return;
+            }
+
+            baseButton.OnSelected += OnButtonSelected;
+            baseButton.OnDeselected += OnButtonDeselected;
+            ChangeData(data);
+        }
+
+        public override void ChangeData(SettingData newData)
+        {
+            base.ChangeData(newData);
+            Debug.Assert(newData is ColorData, "newData is not ColorData");
+            data = (ColorData)newData;
+        }
+
+        public override void Dispose()
+        {
+            button.OnSelected -= OnButtonSelected;
+            button.OnDeselected -= OnButtonDeselected;
+        }
+        
+        [FactoryRegistration]
+        private static void RegisterInFactory() =>
+            MonoUiManager.Instance.BehavioursFactory.Register("ChangeTextColor", typeof(ChangeTextColorBehaviour));
+
+        private void OnButtonSelected(bool _) => button.Text.color = data.SelectedColor;
+        private void OnButtonDeselected(bool _) => button.Text.color = data.DeselectedColor;
+
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs.meta b/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs.meta
new file mode 100644
index 0000000..c279ffe
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f2079225d6e34001ae85f74a0a418d68
+timeCreated: 1683919878
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs b/NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs
new file mode 100644
index 0000000..156b8c9
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs
@@ -0,0 +1,24 @@
+using NEG.UI.UnityUi.Buttons.Settings;
+using NEG.Utils;
+#if FMOD
+
+namespace NEG.UI.UnityUi.Buttons.Reaction
+{
+    public class SimpleSoundBehaviour : ButtonElementBehaviour
+    {
+        public SimpleSoundBehaviour(BaseButton baseButton, FmodSoundData data) : base(baseButton, data)
+        {
+            //TODO: use silnet to not play sound
+        }
+
+        [FactoryRegistration]
+        private static void RegisterInFactory() =>
+            MonoUiManager.Instance.BehavioursFactory.Register("SimpleSound", typeof(SimpleSoundBehaviour));
+
+        public override void ChangeData(SettingData newData) => throw new System.NotImplementedException();
+
+        public override void Dispose() => throw new System.NotImplementedException();
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs.meta b/NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs.meta
new file mode 100644
index 0000000..80fe7c7
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Reaction/SimpleSoundBehaviour.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d75c0d86eeab47a1a6340f0b03b83de0
+timeCreated: 1684002680
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings.meta b/NEG/UI/UnityUi/Buttons/Settings.meta
new file mode 100644
index 0000000..ca86009
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d25aba738e174616bcab9bf2d52a3ed1
+timeCreated: 1683398272
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs b/NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs
new file mode 100644
index 0000000..3486140
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace NEG.UI.UnityUi.Buttons.Settings
+{
+    public class ButtonSettings : MonoBehaviour
+    {
+        [SerializeField] private List<SettingData> settingDatas = new();
+
+        public void Apply(BaseButton button)
+        {
+            foreach (var setting in settingDatas)
+            {
+                setting.Apply(button);
+            }
+        }
+        
+        [ContextMenu("Refresh")]
+        public void Refresh()
+        {
+            settingDatas.Clear();
+            var components = GetComponents<SettingData>();
+            foreach (var data in components)        
+            {
+                settingDatas.Add(data);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs.meta b/NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs.meta
new file mode 100644
index 0000000..3963193
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b5292008faae496ab9028ad1faa0a3ba
+timeCreated: 1683398713
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/ColorData.cs b/NEG/UI/UnityUi/Buttons/Settings/ColorData.cs
new file mode 100644
index 0000000..5ae395a
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/ColorData.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace NEG.UI.UnityUi.Buttons.Settings
+{
+    public class ColorData : SettingData
+    {
+        [field: SerializeField] public Color SelectedColor { get; private set; } = Color.black;
+        [field: SerializeField] public Color DeselectedColor { get; private set; } = Color.black;
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/ColorData.cs.meta b/NEG/UI/UnityUi/Buttons/Settings/ColorData.cs.meta
new file mode 100644
index 0000000..3048b95
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/ColorData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cec5286cd31b4819981e244b1adb977e
+timeCreated: 1684001181
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs b/NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs
new file mode 100644
index 0000000..d2e6328
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs
@@ -0,0 +1,14 @@
+#if FMOD
+using FMODUnity;
+using UnityEngine;
+
+namespace NEG.UI.UnityUi.Buttons.Settings
+{
+    public class FmodSoundData : SettingData
+    {
+        [field: SerializeField] public EventReference SelectedSound { get; private set; }
+        [field: SerializeField] public EventReference ClickedSound { get; private set; }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs.meta b/NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs.meta
new file mode 100644
index 0000000..dc9815b
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8e6a7b10c07d40408ee9492c931e3ec9
+timeCreated: 1684001979
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs b/NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs
new file mode 100644
index 0000000..5c00c32
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs
@@ -0,0 +1,7 @@
+namespace NEG.UI.UnityUi.Buttons.Settings
+{
+    public class RemoveFeature : SettingData
+    {
+        public override void Apply(BaseButton button) => button.RemoveSetting(Key);
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs.meta b/NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs.meta
new file mode 100644
index 0000000..bbda786
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/RemoveFeature.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3b44cdc2e0164ebdb8f6da348d653e77
+timeCreated: 1684001264
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/SettingData.cs b/NEG/UI/UnityUi/Buttons/Settings/SettingData.cs
new file mode 100644
index 0000000..f2ad4d2
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/SettingData.cs
@@ -0,0 +1,28 @@
+using KBCore.Refs;
+using System;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace NEG.UI.UnityUi.Buttons.Settings
+{
+    public abstract class SettingData : MonoBehaviour
+    {
+        [field: SerializeField] public string Key { get; private set; }
+        [SerializeField, Self(Flag.Optional)] private BaseButton attachedButton;
+
+        public virtual void Apply(BaseButton button) => button.AddOrOverrideSetting(this);
+
+        private void Awake()
+        {
+            if(attachedButton != null)
+                Apply(attachedButton);
+        }
+
+        private void OnValidate()
+        {
+            this.ValidateRefs();
+            if (attachedButton == null && TryGetComponent(out ButtonSettings settings))
+                settings.Refresh();
+        } 
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/SettingData.cs.meta b/NEG/UI/UnityUi/Buttons/Settings/SettingData.cs.meta
new file mode 100644
index 0000000..4858d56
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/SettingData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 49b3fccda2b4485193eada1b3611ea40
+timeCreated: 1684001079
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs b/NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs
new file mode 100644
index 0000000..054a002
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace NEG.UI.UnityUi.Buttons.Settings
+{
+    public class SpriteData : SettingData
+    {
+        [field: SerializeField] public Sprite SelectedSprite { get; private set; }
+        [field: SerializeField] public Sprite DeselectedSprite { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs.meta b/NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs.meta
new file mode 100644
index 0000000..6e5a353
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/Settings/SpriteData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aeba07ffa68b4674bc7025ba4f328562
+timeCreated: 1684001906
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/MonoUiInputManger.cs b/NEG/UI/UnityUi/MonoUiInputManger.cs
new file mode 100644
index 0000000..cdd3a99
--- /dev/null
+++ b/NEG/UI/UnityUi/MonoUiInputManger.cs
@@ -0,0 +1,82 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.UI;
+
+namespace NEG.UI.UnityUi
+{
+    public enum SelectionSource
+    {
+        Pointer,
+        Direction
+    }
+
+    public class UiInputModule { }
+
+    public class DefaultInputModule : UiInputModule
+    {
+        public SelectionSource CurrentSelectionSource { get; private set; }
+        
+        public DefaultInputModule()
+        {
+            var defaultActions = new DefaultInputActions();
+            InputActionReference.Create(defaultActions.UI.Navigate).action.performed += (ctx) => OnSelectionChangeStarted();
+            defaultActions.Enable();
+
+            if (Gamepad.current != null)
+                SetDirectionInput();
+            else
+                SetPointerInput();
+
+            //var keyboardAction = new InputAction(binding: "/<Keyboard>/*");
+            //keyboardAction.performed += (context) => CurrentInputSource = EInputSource.Keyboard;
+            //keyboardAction.Enable();
+            var gamepadAction = new InputAction(binding: "/<Gamepad>/*");
+            gamepadAction.performed += (context) => OnSelectionChangeStarted();
+            gamepadAction.Enable();
+            
+            var mouseAction = new InputAction(binding: "/<Mouse>/*");
+            mouseAction.performed += (context) =>
+            {
+                if(CurrentSelectionSource == SelectionSource.Pointer)
+                    return;
+                SetPointerInput();
+            };
+            mouseAction.Enable();
+        }
+
+        private void OnSelectionChangeStarted()
+        {
+            if(CurrentSelectionSource == SelectionSource.Direction)
+                return;
+            SetDirectionInput();
+        }
+
+        private void SetDirectionInput()
+        {
+            CurrentSelectionSource = SelectionSource.Direction;
+            Cursor.visible = false;
+        }
+
+        private void SetPointerInput()
+        {
+            CurrentSelectionSource = SelectionSource.Pointer;
+            Cursor.visible = true;
+            if (EventSystem.current.currentInputModule != null)
+            {
+                var module = (InputSystemUIInputModule)EventSystem.current.currentInputModule;
+                var result = module.GetLastRaycastResult(0);
+                var data = new PointerEventData(EventSystem.current);
+                for (var current = result.gameObject.transform;
+                     current != null;
+                     current = current.parent)
+                {
+                    ExecuteEvents.Execute(current.gameObject, data, ExecuteEvents.pointerEnterHandler);
+                }
+
+                //EventSystem.current.SetSelectedGameObject(result.gameObject);
+            }
+                
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/MonoUiInputManger.cs.meta b/NEG/UI/UnityUi/MonoUiInputManger.cs.meta
new file mode 100644
index 0000000..7ed2fdf
--- /dev/null
+++ b/NEG/UI/UnityUi/MonoUiInputManger.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f6cd55755dda4f71a4257fac75cb902d
+timeCreated: 1684009354
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/MonoUiManager.cs b/NEG/UI/UnityUi/MonoUiManager.cs
index 6c26ed0..2dd98ba 100644
--- a/NEG/UI/UnityUi/MonoUiManager.cs
+++ b/NEG/UI/UnityUi/MonoUiManager.cs
@@ -1,43 +1,61 @@
 using NEG.UI.Area;
 using NEG.UI.Popup;
+using NEG.UI.UnityUi.Buttons.Reaction;
+using NEG.UI.UnityUi.Buttons.Settings;
 using NEG.UI.UnityUi.Popup;
+using NEG.Utils;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.AddressableAssets;
 using UnityEngine.Assertions;
 using UnityEngine.SceneManagement;
+using Object = UnityEngine.Object;
 
 namespace NEG.UI.UnityUi
 {
     /// <summary>
     /// Implements ui using UnityUI and Unity Event System with New Input System.
-    /// <para>You have to provide prefabs with addresses:</para>
-    /// <para> - NEG/UI/PopupCanvas - prefab with canvas to create popups (will be created on every scene)</para>
-    /// <para> - NEG/UI/DefaultPopupPrefab - prefab of default popup with 2 options (has to have <see cref="MonoDefaultPopup"/> component)</para>
+    /// <para>You have to provide prefabs within resources:</para>
+    /// <para> - UI/PopupCanvas - prefab with canvas to create popups (will be created on every scene)</para>
+    /// <para> - UI/DefaultPopupPrefab - prefab of default popup with 2 options (has to have <see cref="MonoDefaultPopup"/> component)</para>
     /// </summary>
     public class MonoUiManager : UiManager
     {
         //TODO: use default unity selection
         //TODO: window snaping to slots
+        public static new MonoUiManager Instance { get; private set; }
+        
+        public KeyBasedFactory<string, ButtonElementBehaviour> BehavioursFactory { get; private set; }
         
         private readonly MonoDefaultPopup defaultPopupPrefab;
         private readonly GameObject canvasPrefab;
 
-        public MonoUiManager(IArea startArea) : base(startArea)
+        private UiInputModule inputModule;
+
+        public MonoUiManager(IArea startArea, Type inputModuleType) : base(startArea)
         {
-            var prefabs =
-                Addressables.LoadAssetsAsync<GameObject>(new List<string>() { "NEG/UI/PopupCanvas", "NEG/UI/DefaultPopupPrefab" }, (_) => { }, Addressables.MergeMode.Union).WaitForCompletion();
-      
-            Assert.AreEqual(prefabs.Count, 2, "No prefabs was provided. Please check MonoUiManager class documentation");
-            Assert.IsNotNull(prefabs[0].GetComponent<Canvas>());
-            Assert.IsNotNull(prefabs[1].GetComponent<MonoDefaultPopup>());
+            Instance = this;
             
-            canvasPrefab = prefabs[0];
-            defaultPopupPrefab = prefabs[1].GetComponent<MonoDefaultPopup>();
+            var popupCanvas = Resources.Load<GameObject>("UI/PopupCanvas");
+            var defaultPopup = Resources.Load<GameObject>("UI/DefaultPopupPrefab");
+                //Addressables.LoadAssetsAsync<GameObject>(new List<string>() { "NEG/UI/PopupCanvas", "NEG/UI/DefaultPopupPrefab" }, (_) => { }, Addressables.MergeMode.Union).WaitForCompletion();
+      
+            Assert.IsNotNull(popupCanvas,"No canvas prefab was provided. Please check MonoUiManager class documentation");
+            Assert.IsNotNull(defaultPopup,"No popup prefab was provided. Please check MonoUiManager class documentation");
+            Assert.IsNotNull(popupCanvas.GetComponent<Canvas>());
+            Assert.IsNotNull(defaultPopup.GetComponent<MonoDefaultPopup>());
+
+            canvasPrefab = popupCanvas;
+            defaultPopupPrefab = defaultPopup.GetComponent<MonoDefaultPopup>();
             
             SpawnDefaultPopup();
 
             SceneManager.activeSceneChanged += (_, _) => SpawnDefaultPopup();
+
+            BehavioursFactory = new KeyBasedFactory<string, ButtonElementBehaviour>();
+            BehavioursFactory.FireRegistration();
+
+            inputModule = (UiInputModule)Activator.CreateInstance(inputModuleType);
         }
 
         private void SpawnDefaultPopup()
diff --git a/NEG/UI/UnityUi/NEG.UI.UnityUi.asmdef b/NEG/UI/UnityUi/NEG.UI.UnityUi.asmdef
index e83fade..04c2930 100644
--- a/NEG/UI/UnityUi/NEG.UI.UnityUi.asmdef
+++ b/NEG/UI/UnityUi/NEG.UI.UnityUi.asmdef
@@ -5,10 +5,11 @@
         "GUID:343deaaf83e0cee4ca978e7df0b80d21",
         "GUID:7361f1d9c43da6649923760766194746",
         "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:23eed6c2401dca1419d1ebd180e58c5a",
+        "GUID:33759803a11f4d538227861a78aba30b",
         "GUID:0c752da273b17c547ae705acf0f2adf2",
-        "GUID:9e24947de15b9834991c9d8411ea37cf",
-        "GUID:84651a3751eca9349aac36a66bba901b",
-        "GUID:23eed6c2401dca1419d1ebd180e58c5a"
+        "GUID:3c4294719a93e3c4e831a9ff0c261e8a",
+        "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/NEG/UI/UnityUi/SilentEventData.cs b/NEG/UI/UnityUi/SilentEventData.cs
new file mode 100644
index 0000000..1c02b14
--- /dev/null
+++ b/NEG/UI/UnityUi/SilentEventData.cs
@@ -0,0 +1,11 @@
+using UnityEngine.EventSystems;
+
+namespace NEG.UI.UnityUi
+{
+    public class SilentEventData : BaseEventData
+    {
+        public SilentEventData(EventSystem eventSystem) : base(eventSystem)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/SilentEventData.cs.meta b/NEG/UI/UnityUi/SilentEventData.cs.meta
new file mode 100644
index 0000000..2ac2f22
--- /dev/null
+++ b/NEG/UI/UnityUi/SilentEventData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 718df112d05a4270bad895acce9dfa87
+timeCreated: 1684008766
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index d13a121..c460b5a 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -21,6 +21,8 @@ namespace NEG.UI.UnityUi.Window
         [SerializeField] private List<MonoWindowSlot> windowSlots;
         [SerializeField] private WindowController controller;
 
+        [SerializeField] private GameObject defaultSelectedItem;
+
         public void SetOpenedState(IWindowSlot parentSlot)
         {
             gameObject.SetActive(true);
@@ -48,6 +50,8 @@ namespace NEG.UI.UnityUi.Window
         {
             if (controller == null)
                 controller = GetComponent<WindowController>();
+            if(defaultSelectedItem == null)
+                Debug.LogWarning("Window should have default selected item set");
         }
 
         public void OpenWindow(IWindow window, object data = null)
diff --git a/NEG/UI/WindowSlot/IWindowSlot.cs b/NEG/UI/WindowSlot/IWindowSlot.cs
index 16f2189..07dfa27 100644
--- a/NEG/UI/WindowSlot/IWindowSlot.cs
+++ b/NEG/UI/WindowSlot/IWindowSlot.cs
@@ -3,7 +3,7 @@ using NEG.UI.Window;
 
 namespace NEG.UI.WindowSlot
 {
-    public interface IWindowSlot
+    public interface  IWindowSlot
     {
         bool OpenWindowAsMain { get; }
         ISlotsHolder ParentHolder { get; }
diff --git a/RequireInterfaceAttribute.cs b/RequireInterfaceAttribute.cs
index 47cd16e..21d71d8 100644
--- a/RequireInterfaceAttribute.cs
+++ b/RequireInterfaceAttribute.cs
@@ -15,7 +15,7 @@ namespace NEG.Utils
         /// <param name="type">Interface type.</param>
         public RequireInterfaceAttribute(System.Type type)
         {
-            this.requiredType = type;
+            requiredType = type;
         }
     }
 }
\ No newline at end of file
diff --git a/Timing/AutoTimeMachine.cs b/Timing/AutoTimeMachine.cs
index 6bcf59f..c12e93e 100644
--- a/Timing/AutoTimeMachine.cs
+++ b/Timing/AutoTimeMachine.cs
@@ -1,11 +1,15 @@
-using System;
+using JetBrains.Annotations;
+using System;
 
 namespace NEG.Utils.Timing
 {
     public class AutoTimeMachine
     {
+        [PublicAPI]
         public double Interval { get; set; }
-        public Action Action { get; set; }
+        
+        [PublicAPI]
+        public Action Action { get; }
         
         private readonly TimeMachine machine;
         
diff --git a/Timing/TimeMachine.cs b/Timing/TimeMachine.cs
index d80ed00..2784213 100644
--- a/Timing/TimeMachine.cs
+++ b/Timing/TimeMachine.cs
@@ -5,66 +5,61 @@ namespace NEG.Utils.Timing
 {
     public class TimeMachine
     {
-        private double time;
+        private double timeInternal;
 
         public TimeMachine()
         {
-            time = 0;
+            timeInternal = 0;
         }
 
         /// <summary>
         /// Adds time into the TimeMachine
         /// </summary>
         /// <param name="time">Amount of time to be added</param>
-        public void Accumulate(double time) 
-        {
-            this.time += time;
-        }
+        public void Accumulate(double time) => timeInternal += time;
 
         /// <summary>
         /// Retrieves given amount of time from the TimeMachine
         /// </summary>
         /// <param name="maxTime"></param>
-        /// <returns>Amount of time retrievend</returns>
+        /// <returns>Amount of time retrieved</returns>
         public double Retrieve(double maxTime) 
         {
             if(!double.IsFinite(maxTime))
             {
-                double timeRetrieved = time;
-                time = 0;
+                double timeRetrieved = timeInternal;
+                timeInternal = 0;
                 return timeRetrieved;
             }
-            double timeLeft = time - maxTime;
-            time = Math.Max(timeLeft, 0);
+            double timeLeft = timeInternal - maxTime;
+            timeInternal = Math.Max(timeLeft, 0);
             return Math.Min(maxTime + timeLeft, maxTime);
         }
 
         /// <summary>
         /// Attempts to retrieves given amount of time from the TimeMachine <br/>
-        /// If there is enough <paramref name="time"/> accumulated in this machine subtructs that amount and returns true, otherwise returns false
+        /// If there is enough <paramref name="time"/> accumulated in this machine subtracts that amount and returns true, otherwise returns false
         /// </summary>
         /// <param name="time"></param>
         public bool TryRetrieve(double time)
         {
-            if (this.time >= time)
-            {
-                this.time -= time;
-                return true;
-            }
-            return false;
+            if (!(timeInternal >= time)) 
+                return false;
+            timeInternal -= time;
+            return true;
         }
 
         /// <summary>
         /// Result is equivalent to calling <see cref="TryRetrieve(double)"/> as many times as possible, but is faster for larger <paramref name="limit"/> values
         /// </summary>
-        /// <param name="interval">Single unit of warp time, must be positive/param>
+        /// <param name="interval">Single unit of warp time, must be positive</param>
         /// <param name="limit">Maximum amount of warps, must be positive</param>
         /// <returns>Amount of warps</returns>
         public int RetrieveAll(double interval, int limit = int.MaxValue)
         {
-            int result = Mathf.FloorToInt((float)(time / interval));
+            int result = Mathf.FloorToInt((float)(timeInternal / interval));
             result = Math.Clamp(result, 0, limit);
-            time -= result * interval;
+            timeInternal -= result * interval;
             return result;
         }
     }

From 7bf4512c4311605f2b5e32531ca6725cd658feb8 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Fri, 19 May 2023 20:58:53 +0200
Subject: [PATCH 05/20] Working on selection

---
 Editor/MonoBehaviourExtensions.cs             | 46 ++++++++++++++
 Editor/MonoBehaviourExtensions.cs.meta        |  3 +
 .../UnityUi/Buttons/CustomNavigationButton.cs | 63 +++++++++++++++++++
 .../Buttons/CustomNavigationButton.cs.meta    |  3 +
 NEG/UI/UnityUi/Editor.meta                    |  8 +++
 NEG/UI/UnityUi/Editor/ButtonsExtensions.cs    | 42 +++++++++++++
 .../UnityUi/Editor/ButtonsExtensions.cs.meta  | 11 ++++
 .../Editor/CustomNavigationButtonEditor.cs    | 37 +++++++++++
 .../CustomNavigationButtonEditor.cs.meta      |  3 +
 .../Editor/NEG.UI.UnityUi.Editor.asmdef       | 18 ++++++
 .../Editor/NEG.UI.UnityUi.Editor.asmdef.meta  |  7 +++
 NEG/UI/UnityUi/MonoUiInputManger.cs           | 27 ++++----
 12 files changed, 255 insertions(+), 13 deletions(-)
 create mode 100644 Editor/MonoBehaviourExtensions.cs
 create mode 100644 Editor/MonoBehaviourExtensions.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs.meta
 create mode 100644 NEG/UI/UnityUi/Editor.meta
 create mode 100644 NEG/UI/UnityUi/Editor/ButtonsExtensions.cs
 create mode 100644 NEG/UI/UnityUi/Editor/ButtonsExtensions.cs.meta
 create mode 100644 NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs
 create mode 100644 NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs.meta
 create mode 100644 NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef
 create mode 100644 NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef.meta

diff --git a/Editor/MonoBehaviourExtensions.cs b/Editor/MonoBehaviourExtensions.cs
new file mode 100644
index 0000000..fb4464d
--- /dev/null
+++ b/Editor/MonoBehaviourExtensions.cs
@@ -0,0 +1,46 @@
+using System.IO;
+using UnityEngine;
+using UnityEditor;
+
+namespace NEG.Utils.Editor
+{
+    public static class MonoBehaviourExtensions
+    {
+        [MenuItem("CONTEXT/MonoBehaviour/Change Script")]
+        public static void ChangeScript(MenuCommand command)
+        {
+            if (command.context == null) 
+                return;
+ 
+            var monoBehaviour = command.context as MonoBehaviour;
+            var monoScript = MonoScript.FromMonoBehaviour(monoBehaviour);
+ 
+            string scriptPath = AssetDatabase.GetAssetPath(monoScript);
+            string directoryPath = new FileInfo(scriptPath).Directory?.FullName;
+ 
+            // Allow the user to select which script to replace with
+            string newScriptPath = EditorUtility.OpenFilePanel("Select replacement script", directoryPath, "cs");
+ 
+            // Don't log anything if they cancelled the window
+            if (string.IsNullOrEmpty(newScriptPath)) return;
+
+            // Load the selected asset
+            string relativePath = "Assets\\" + Path.GetRelativePath(Application.dataPath, newScriptPath);
+            var chosenTextAsset = AssetDatabase.LoadAssetAtPath<TextAsset>(relativePath);
+ 
+            if (chosenTextAsset == null)
+            {
+                Debug.LogWarning($"Selected script couldn't be loaded ({relativePath})");
+                return;
+            }
+ 
+            Undo.RegisterCompleteObjectUndo(command.context, "Changing component script");
+ 
+            var so = new SerializedObject(monoBehaviour);
+            var scriptProperty = so.FindProperty("m_Script");
+            so.Update();
+            scriptProperty.objectReferenceValue = chosenTextAsset;
+            so.ApplyModifiedProperties();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/MonoBehaviourExtensions.cs.meta b/Editor/MonoBehaviourExtensions.cs.meta
new file mode 100644
index 0000000..c9d97d5
--- /dev/null
+++ b/Editor/MonoBehaviourExtensions.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0501eedeaf1d4dcf8c4d0f1b7a0c1761
+timeCreated: 1684519404
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs b/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs
new file mode 100644
index 0000000..d32918e
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs
@@ -0,0 +1,63 @@
+using System;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+namespace NEG.UI.UnityUi.Buttons
+{
+    public class CustomNavigationButton : Button
+    {
+        [SerializeField] private OverridableNavigation upOverride;
+        [SerializeField] private OverridableNavigation downOverride;
+        [SerializeField] private OverridableNavigation leftOverride;
+        [SerializeField] private OverridableNavigation rightOverride;
+        
+        
+        public override void OnMove(AxisEventData eventData)
+        {
+            switch (eventData.moveDir)
+            {
+                case MoveDirection.Left:
+                    if(TryNavigate(eventData, leftOverride))
+                        return;
+                    break;
+                case MoveDirection.Up:
+                    if(TryNavigate(eventData, upOverride))
+                        return;
+                    break;
+                case MoveDirection.Right:
+                    if(TryNavigate(eventData, rightOverride))
+                        return;
+                    break;
+                case MoveDirection.Down:
+                    if(TryNavigate(eventData, downOverride))
+                        return;
+                    break;
+                case MoveDirection.None:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+            base.OnMove(eventData);
+        }
+
+        public static bool TryNavigate(BaseEventData eventData, OverridableNavigation overrideNavigation)
+        {
+            if(!overrideNavigation.Override)
+                return false;
+
+            if (overrideNavigation.Selectable == null || !overrideNavigation.Selectable.IsActive()) 
+                return true;
+            
+            eventData.selectedObject = overrideNavigation.Selectable.gameObject;
+            return true;
+        }
+    }
+
+    [Serializable]
+    public class OverridableNavigation
+    {
+        [field: SerializeField] public bool Override { get; private set; }
+        [field: SerializeField] public Selectable Selectable { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs.meta b/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs.meta
new file mode 100644
index 0000000..fdc8817
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d9b5ca8863c240f792232d6e276d8d56
+timeCreated: 1684520970
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Editor.meta b/NEG/UI/UnityUi/Editor.meta
new file mode 100644
index 0000000..3368917
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ffc2c67f6a714d441aa9dfd425e5937e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/NEG/UI/UnityUi/Editor/ButtonsExtensions.cs b/NEG/UI/UnityUi/Editor/ButtonsExtensions.cs
new file mode 100644
index 0000000..5817242
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/ButtonsExtensions.cs
@@ -0,0 +1,42 @@
+using NEG.UI.UnityUi.Buttons;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace NEG.UI.UnityUi.Editor
+{
+    public static class ButtonsExtensions
+    {
+        [MenuItem("CONTEXT/Button/Change To Navigation Button")]
+        public static void ChangeScript(MenuCommand command)
+        {
+            if (command.context == null)
+                return;
+
+            var button = command.context as Button;
+            var go = new GameObject();
+            var sourceScriptAsset = MonoScript.FromMonoBehaviour(go.AddComponent<CustomNavigationButton>());
+            string relativePath = AssetDatabase.GetAssetPath(sourceScriptAsset);
+            Object.DestroyImmediate(go);
+            
+            var chosenTextAsset = AssetDatabase.LoadAssetAtPath<TextAsset>(relativePath);
+
+            if (chosenTextAsset == null)
+            {
+                Debug.LogWarning($"Selected script couldn't be loaded ({relativePath})");
+                return;
+            }
+
+            Undo.RegisterCompleteObjectUndo(command.context, "Changing component script");
+
+            var so = new SerializedObject(button);
+            var scriptProperty = so.FindProperty("m_Script");
+            so.Update();
+            scriptProperty.objectReferenceValue = chosenTextAsset;
+            so.ApplyModifiedProperties();
+        }
+
+    }
+}
diff --git a/NEG/UI/UnityUi/Editor/ButtonsExtensions.cs.meta b/NEG/UI/UnityUi/Editor/ButtonsExtensions.cs.meta
new file mode 100644
index 0000000..824b795
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/ButtonsExtensions.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4b09e744f7ec6704c95ec273584a964f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs b/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs
new file mode 100644
index 0000000..0557b31
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs
@@ -0,0 +1,37 @@
+using UnityEditor;
+using UnityEditor.UI;
+using UnityEngine.UIElements;
+
+namespace NEG.UI.UnityUi.Editor
+{
+    [CustomEditor(typeof(Buttons.CustomNavigationButton), true)]
+    public class CustomNavigationButtonEditor : ButtonEditor
+    {
+        private SerializedProperty upOverrideProperty;
+        private SerializedProperty downOverrideProperty;
+        private SerializedProperty leftOverrideProperty;
+        private SerializedProperty rightOverrideProperty;
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+            upOverrideProperty = serializedObject.FindProperty("upOverride");
+            downOverrideProperty = serializedObject.FindProperty("downOverride");
+            leftOverrideProperty = serializedObject.FindProperty("leftOverride");
+            rightOverrideProperty = serializedObject.FindProperty("rightOverride");
+        }
+
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+            EditorGUILayout.Space();
+
+            serializedObject.Update();
+            EditorGUILayout.PropertyField(upOverrideProperty);
+            EditorGUILayout.PropertyField(downOverrideProperty);
+            EditorGUILayout.PropertyField(leftOverrideProperty);
+            EditorGUILayout.PropertyField(rightOverrideProperty);
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs.meta b/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs.meta
new file mode 100644
index 0000000..f60cf54
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 162f4693585f414b85f0a4210a10a585
+timeCreated: 1684521873
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef b/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef
new file mode 100644
index 0000000..e75674d
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "NEG.UI.UnityUi.Editor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:e2aaf8effe1c9634d87b2edda6988a6a"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef.meta b/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef.meta
new file mode 100644
index 0000000..3960400
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d7c723fd6c577334eb3ec43fa26c4a23
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/NEG/UI/UnityUi/MonoUiInputManger.cs b/NEG/UI/UnityUi/MonoUiInputManger.cs
index cdd3a99..1285f13 100644
--- a/NEG/UI/UnityUi/MonoUiInputManger.cs
+++ b/NEG/UI/UnityUi/MonoUiInputManger.cs
@@ -62,21 +62,22 @@ namespace NEG.UI.UnityUi
         {
             CurrentSelectionSource = SelectionSource.Pointer;
             Cursor.visible = true;
-            if (EventSystem.current.currentInputModule != null)
+            
+            if (EventSystem.current.currentInputModule == null) 
+                return;
+            
+            var module = (InputSystemUIInputModule)EventSystem.current.currentInputModule;
+            var result = module.GetLastRaycastResult(0);
+            if(result.gameObject == null)
+                return;
+            
+            var data = new PointerEventData(EventSystem.current);
+            for (var current = result.gameObject.transform;
+                 current != null;
+                 current = current.parent)
             {
-                var module = (InputSystemUIInputModule)EventSystem.current.currentInputModule;
-                var result = module.GetLastRaycastResult(0);
-                var data = new PointerEventData(EventSystem.current);
-                for (var current = result.gameObject.transform;
-                     current != null;
-                     current = current.parent)
-                {
-                    ExecuteEvents.Execute(current.gameObject, data, ExecuteEvents.pointerEnterHandler);
-                }
-
-                //EventSystem.current.SetSelectedGameObject(result.gameObject);
+                ExecuteEvents.Execute(current.gameObject, data, ExecuteEvents.pointerEnterHandler);
             }
-                
         }
     }
 }
\ No newline at end of file

From e30470d27a0a6d0b43c7a86b6490aa99ce996745 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Fri, 19 May 2023 22:52:09 +0200
Subject: [PATCH 06/20] update window

---
 NEG/UI/UnityUi/Window/MonoWindow.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index f37bc89..147239a 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -6,6 +6,7 @@ using NEG.UI.WindowSlot;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 namespace NEG.UI.UnityUi.Window
 {
@@ -27,6 +28,7 @@ namespace NEG.UI.UnityUi.Window
         {
             gameObject.SetActive(true);
             Parent = parentSlot;
+            EventSystem.current.SetSelectedGameObject(defaultSelectedItem);
             if (controller != null) 
                 controller.OnOpened();
         }

From 1e66136bfcae39e17c93a679f4f640392e7709db Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sat, 20 May 2023 20:03:25 +0200
Subject: [PATCH 07/20] Cleanup

---
 NEG/UI/UnityUi/Buttons/BaseButton.cs  | 5 +----
 NEG/UI/UnityUi/Buttons/Overrides.meta | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 NEG/UI/UnityUi/Buttons/Overrides.meta

diff --git a/NEG/UI/UnityUi/Buttons/BaseButton.cs b/NEG/UI/UnityUi/Buttons/BaseButton.cs
index 2d5234f..4d495de 100644
--- a/NEG/UI/UnityUi/Buttons/BaseButton.cs
+++ b/NEG/UI/UnityUi/Buttons/BaseButton.cs
@@ -27,8 +27,6 @@ namespace NEG.UI.UnityUi.Buttons
 
         public TMP_Text Text => text;
 
-        private bool isHovered;
-
         [SerializeField, Self] private Button button;
         [SerializeField, Child(Flag.Optional)] private TMP_Text text;
         [SerializeField, Child(Flag.Optional)] private Image icon;
@@ -36,7 +34,7 @@ namespace NEG.UI.UnityUi.Buttons
         [SerializeField] private ButtonSettings groupButtonSettings;
         //[SerializeField, Self(Flag.Optional)] private ButtonSettingOverride overrideSettings;
 
-        private Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>();
+        private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>();
 
         public virtual void OnSelect(BaseEventData eventData) => OnSelected?.Invoke(eventData is SilentEventData);
         
@@ -91,7 +89,6 @@ namespace NEG.UI.UnityUi.Buttons
         protected virtual void OnClicked()
         {
             OnDeselect(null);
-            isHovered = false;
             OnButtonPressed?.Invoke();
         }
     }
diff --git a/NEG/UI/UnityUi/Buttons/Overrides.meta b/NEG/UI/UnityUi/Buttons/Overrides.meta
deleted file mode 100644
index 36b4ab2..0000000
--- a/NEG/UI/UnityUi/Buttons/Overrides.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: c431f6df68cb4163b9764b6a87abd31a
-timeCreated: 1683915618
\ No newline at end of file

From c0dd3dfdc53877d3b3df25d06d12d4591b58d07e Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Mon, 22 May 2023 20:33:17 +0200
Subject: [PATCH 08/20] add define

---
 UiToolkit/MultiSelectChips/MultiSelectChipItem.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
index 84d795b..a5b6c96 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+#if ADDRESSABLES && UI_ELEMENTS
+using System.Collections;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -21,4 +22,5 @@ namespace NEG.Utils.UiToolkits
             visualElement.Q<Button>("RemoveBtn").clicked += () => parent.TryRemoveItem(element);
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

From 8fe292818e3375ee1781b1065818b1f62c52943d Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sat, 27 May 2023 21:39:28 +0200
Subject: [PATCH 09/20] Add custom editor

---
 Editor/SerializationExtentions.cs             |  4 +-
 NEG/UI/UiManager.cs                           | 11 ++-
 .../Editor/NEG.UI.UnityUi.Editor.asmdef       |  3 +-
 .../Editor/OverridableNavigationDrawer.cs     | 94 +++++++++++++++++++
 .../OverridableNavigationDrawer.cs.meta       |  3 +
 NEG/UI/UnityUi/MonoUiManager.cs               |  9 +-
 VectorSwizzle.cs                              |  2 +
 7 files changed, 117 insertions(+), 9 deletions(-)
 create mode 100644 NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
 create mode 100644 NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs.meta

diff --git a/Editor/SerializationExtentions.cs b/Editor/SerializationExtentions.cs
index e3ba2c3..2e37ad4 100644
--- a/Editor/SerializationExtentions.cs
+++ b/Editor/SerializationExtentions.cs
@@ -14,8 +14,8 @@ namespace NEG.Utils.Serialization
         {
             return @this.FindPropertyRelative(GetBackingFieldName(name));
         }
-
-        private static string GetBackingFieldName(string name)
+        
+        public static string GetBackingFieldName(string name)
         {
 #if NET_STANDARD || NET_STANDARD_2_1
         return string.Create(1/*<*/ + name.Length + 16/*>k__BackingField*/, name, static (span, name) =>
diff --git a/NEG/UI/UiManager.cs b/NEG/UI/UiManager.cs
index 7348c9e..a935581 100644
--- a/NEG/UI/UiManager.cs
+++ b/NEG/UI/UiManager.cs
@@ -10,9 +10,9 @@ using UnityEngine;
 namespace NEG.UI
 {
     [PublicAPI]
-    public abstract class UiManager
+    public abstract class UiManager : IDisposable
     {
-        public static UiManager Instance { get; private set; }
+        public static UiManager Instance { get; protected set; }
         
         /// <summary>
         /// Current area shown on screen.
@@ -131,7 +131,9 @@ namespace NEG.UI
                 return;
             UpdatePopupsState(false);
         }
-        
+
+        public virtual void Dispose() => Instance = null;
+
         protected void PopupClosed(PopupData data)
         {
             if (currentShownPopup.data != data)
@@ -141,9 +143,10 @@ namespace NEG.UI
             }
             UpdatePopupsState(false);
         }
-        
+
         protected void SetDefaultPopup(IDefaultPopup popup) => currentDefaultPopup = popup;
 
+
         private void UpdatePopupsState(bool forceShow, int priority = 0, PopupData data = null)
         {
             if (forceShow)
diff --git a/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef b/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef
index 538cc41..f943876 100644
--- a/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef
+++ b/NEG/UI/UnityUi/Editor/NEG.UI.UnityUi.Editor.asmdef
@@ -2,7 +2,8 @@
     "name": "NEG.UI.UnityUi.Editor",
     "rootNamespace": "",
     "references": [
-        "GUID:e2aaf8effe1c9634d87b2edda6988a6a"
+        "GUID:e2aaf8effe1c9634d87b2edda6988a6a",
+        "GUID:5928dc8d9173fd348aa77d4593ca3fd8"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
new file mode 100644
index 0000000..b667f49
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
@@ -0,0 +1,94 @@
+using NEG.UI.UnityUi.Buttons;
+using NEG.Utils.Serialization;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UI;
+using UnityEngine.UIElements;
+using ObjectField = UnityEditor.Search.ObjectField;
+
+using Toggle = UnityEngine.UIElements.Toggle;
+
+namespace NEG.UI.UnityUi.Editor
+{
+    [CustomPropertyDrawer(typeof(OverridableNavigation))]
+    public class OverridableNavigationDrawer: PropertyDrawer
+    {
+        public override VisualElement CreatePropertyGUI(SerializedProperty property)
+        {
+            var container = new VisualElement()
+            {
+                style =
+                {
+                    paddingLeft = 3,
+                    paddingRight = -2,
+                    flexDirection = FlexDirection.Row,
+                    justifyContent = Justify.SpaceBetween
+                }
+            };
+
+            string name = property.name;
+            if (name.Length > 0)
+            {
+                name = $"{char.ToUpper(name[0])}{name[1..]}";
+            }
+
+            var innerContainer = new VisualElement()
+            {
+                style =
+                {
+                    flexDirection = FlexDirection.Row,
+                    justifyContent = Justify.SpaceBetween,
+                    marginRight = 2,
+                    flexGrow = 1
+                }
+            };
+            
+            var label = new Label(name)
+            {
+                style =
+                {
+                    //
+                }
+            };
+
+            var enabler = new Toggle();
+            enabler.BindProperty(property.FindPropertyRelative("<Override>k__BackingField"));
+            
+            var field = new ObjectField()
+            {
+                style =
+                {
+                    flexGrow = 100
+                }
+            };
+
+            var selectableField = property.FindAutoPropertyRelative(nameof(OverridableNavigation.Selectable));
+
+            field.BindProperty(selectableField);
+            field.objectType = typeof(Selectable);
+            
+            innerContainer.Add(label);
+            innerContainer.Add(enabler);
+
+            container.Add(innerContainer);
+            container.Add(field);
+
+            container.RegisterCallback<GeometryChangedEvent>(_ =>
+            {
+                var panel = container.panel;
+                var size = panel.visualTree.contentRect.size;
+                
+                // magic value measured with ruler, may change in the future!
+                field.style.maxWidth = size.x * 0.55f + 15;
+            });
+            
+            field.SetEnabled(enabler.value);
+            enabler.RegisterValueChangedCallback(v =>
+            {
+                field.SetEnabled(v.newValue);
+            });
+            
+            return container;
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs.meta b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs.meta
new file mode 100644
index 0000000..4762951
--- /dev/null
+++ b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 63ba4de7f1a04763bf035b4a88317a7d
+timeCreated: 1685212390
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/MonoUiManager.cs b/NEG/UI/UnityUi/MonoUiManager.cs
index 13bf73b..041325c 100644
--- a/NEG/UI/UnityUi/MonoUiManager.cs
+++ b/NEG/UI/UnityUi/MonoUiManager.cs
@@ -19,7 +19,7 @@ namespace NEG.UI.UnityUi
     /// <para> - UI/PopupCanvas - prefab with canvas to create popups (will be created on every scene)</para>
     /// <para> - UI/DefaultPopupPrefab - prefab of default popup with 2 options (has to have <see cref="MonoDefaultPopup"/> component)</para>
     /// </summary>
-    public class MonoUiManager : UiManager
+    public class MonoUiManager : UiManager, IDisposable
     {
         //TODO: use default unity selection
         //TODO: window snaping to slots
@@ -60,6 +60,12 @@ namespace NEG.UI.UnityUi
             inputModule = (UiInputModule)Activator.CreateInstance(inputModuleType);
         }
 
+        public override void Dispose()
+        {
+            base.Dispose();
+            Instance = null;
+        }
+
         private void SpawnDefaultPopup()
         {
             var canvas = Object.Instantiate(canvasPrefab);
@@ -67,6 +73,5 @@ namespace NEG.UI.UnityUi
             SetDefaultPopup(Object.Instantiate(defaultPopupPrefab, canvas.transform));
             currentDefaultPopup.Close(true);
         }
-        
     }
 }
\ No newline at end of file
diff --git a/VectorSwizzle.cs b/VectorSwizzle.cs
index 00eb443..d1a7049 100644
--- a/VectorSwizzle.cs
+++ b/VectorSwizzle.cs
@@ -91,6 +91,8 @@ namespace NEG.Utils
 
         public static Vector3 zzz(this Vector3 a) { return new Vector3(a.z, a.z, a.z); }
 
+        public static Vector3 x0y(this Vector2 a) { return new Vector3(a.x, 0f, a.y);}
+
         //swizzles of size 4
         public static Vector4 xxxx(this Vector3 a) { return new Vector4(a.x, a.x, a.x, a.x); }
         public static Vector4 yxxx(this Vector3 a) { return new Vector4(a.y, a.x, a.x, a.x); }

From f837aec845c55a95410da29b3d1dcf396bf3ec22 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Fri, 9 Jun 2023 01:01:46 +0200
Subject: [PATCH 10/20] add features

---
 NEG/UI/UnityUi/Area/AutoWindowOpen.cs         |  1 +
 NEG/UI/UnityUi/Buttons/BaseButton.cs          |  9 ++--
 NEG/UI/UnityUi/Buttons/ButtonReaction.cs      |  9 +++-
 .../UnityUi/Buttons/CustomNavigationButton.cs |  2 +-
 .../Reaction/ChangeTextColorBehaviour.cs      |  3 --
 .../Editor/CustomNavigationButtonEditor.cs    |  1 -
 .../Editor/OverridableNavigationDrawer.cs     | 26 +++++++++
 NEG/UI/UnityUi/MonoUiManager.cs               |  6 ++-
 NEG/UI/UnityUi/Popup/MonoPopup.cs             |  4 +-
 NEG/UI/UnityUi/Window/MonoWindow.cs           | 10 +++-
 NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs   |  3 +-
 .../WindowSlot/SingleWindowSlotWithHistory.cs | 54 +++++++++++++++++++
 .../SingleWindowSlotWithHistory.cs.meta       |  3 ++
 NEG/UI/Window/IWindow.cs                      | 10 ++++
 14 files changed, 124 insertions(+), 17 deletions(-)
 create mode 100644 NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
 create mode 100644 NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs.meta

diff --git a/NEG/UI/UnityUi/Area/AutoWindowOpen.cs b/NEG/UI/UnityUi/Area/AutoWindowOpen.cs
index b19f017..48e1f64 100644
--- a/NEG/UI/UnityUi/Area/AutoWindowOpen.cs
+++ b/NEG/UI/UnityUi/Area/AutoWindowOpen.cs
@@ -1,6 +1,7 @@
 using NEG.UI.UnityUi.Window;
 using NEG.UI.Window;
 using System;
+using KBCore.Refs;
 using UnityEngine;
 
 namespace NEG.UI.Area
diff --git a/NEG/UI/UnityUi/Buttons/BaseButton.cs b/NEG/UI/UnityUi/Buttons/BaseButton.cs
index 4d495de..03b8f9d 100644
--- a/NEG/UI/UnityUi/Buttons/BaseButton.cs
+++ b/NEG/UI/UnityUi/Buttons/BaseButton.cs
@@ -27,7 +27,7 @@ namespace NEG.UI.UnityUi.Buttons
 
         public TMP_Text Text => text;
 
-        [SerializeField, Self] private Button button;
+        [SerializeField, Self(Flag.Optional)] private Button button;
         [SerializeField, Child(Flag.Optional)] private TMP_Text text;
         [SerializeField, Child(Flag.Optional)] private Image icon;
 
@@ -62,7 +62,7 @@ namespace NEG.UI.UnityUi.Buttons
                 setting.ChangeData(data);
                 return;
             }
-            behaviours.Add("ChangeTextColor", MonoUiManager.Instance.BehavioursFactory.CreateInstance(data.Key, this, data));
+            behaviours.Add(data.Key, MonoUiManager.Instance.BehavioursFactory.CreateInstance(data.Key, this, data));
         }
 
         public void RemoveSetting(string key)
@@ -79,7 +79,10 @@ namespace NEG.UI.UnityUi.Buttons
         protected virtual void Awake()
         {
             button.onClick.AddListener(OnClicked);
-            groupButtonSettings.Apply(this);
+            if (groupButtonSettings == null)
+                MonoUiManager.Instance.DefaultUiSettings.Apply(this);
+            else
+                groupButtonSettings.Apply(this);
         }
 
         private void Start() => OnDeselect(null);
diff --git a/NEG/UI/UnityUi/Buttons/ButtonReaction.cs b/NEG/UI/UnityUi/Buttons/ButtonReaction.cs
index 1f30b1d..c2c2590 100644
--- a/NEG/UI/UnityUi/Buttons/ButtonReaction.cs
+++ b/NEG/UI/UnityUi/Buttons/ButtonReaction.cs
@@ -1,4 +1,5 @@
 using System;
+using KBCore.Refs;
 using UnityEngine;
 
 namespace NEG.UI.UnityUi.Buttons
@@ -6,9 +7,13 @@ namespace NEG.UI.UnityUi.Buttons
     [RequireComponent(typeof(BaseButton))]
     public abstract class ButtonReaction : MonoBehaviour
     {
-        protected virtual void Awake() => GetComponent<BaseButton>().OnButtonPressed += OnClicked;
+        [SerializeField, Self(Flag.Optional)] protected BaseButton button;
+        
+        protected virtual void Awake() => button.OnButtonPressed += OnClicked;
 
-        protected virtual void OnDestroy() => GetComponent<BaseButton>().OnButtonPressed -= OnClicked;
+        protected virtual void OnDestroy() => button.OnButtonPressed -= OnClicked;
+
+        private void OnValidate() => this.ValidateRefs();
 
         protected abstract void OnClicked();
     }
diff --git a/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs b/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs
index d32918e..e7e82eb 100644
--- a/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs
+++ b/NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs
@@ -7,7 +7,7 @@ namespace NEG.UI.UnityUi.Buttons
 {
     public class CustomNavigationButton : Button
     {
-        [SerializeField] private OverridableNavigation upOverride;
+        [SerializeField] [HideInInspector] private OverridableNavigation upOverride;
         [SerializeField] private OverridableNavigation downOverride;
         [SerializeField] private OverridableNavigation leftOverride;
         [SerializeField] private OverridableNavigation rightOverride;
diff --git a/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs b/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs
index bd18235..f679698 100644
--- a/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs
+++ b/NEG/UI/UnityUi/Buttons/Reaction/ChangeTextColorBehaviour.cs
@@ -12,10 +12,7 @@ namespace NEG.UI.UnityUi.Buttons.Reaction
         public ChangeTextColorBehaviour(BaseButton baseButton, ColorData data) : base(baseButton, data)
         {
             if (baseButton.Text == null)
-            {
-                Debug.LogError("Button without text was provided");
                 return;
-            }
 
             baseButton.OnSelected += OnButtonSelected;
             baseButton.OnDeselected += OnButtonDeselected;
diff --git a/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs b/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs
index 0557b31..2e92e00 100644
--- a/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs
+++ b/NEG/UI/UnityUi/Editor/CustomNavigationButtonEditor.cs
@@ -25,7 +25,6 @@ namespace NEG.UI.UnityUi.Editor
         {
             base.OnInspectorGUI();
             EditorGUILayout.Space();
-
             serializedObject.Update();
             EditorGUILayout.PropertyField(upOverrideProperty);
             EditorGUILayout.PropertyField(downOverrideProperty);
diff --git a/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
index b667f49..aa1b212 100644
--- a/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
+++ b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
@@ -2,6 +2,7 @@
 using NEG.Utils.Serialization;
 using UnityEditor;
 using UnityEditor.UIElements;
+using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.UIElements;
 using ObjectField = UnityEditor.Search.ObjectField;
@@ -13,6 +14,31 @@ namespace NEG.UI.UnityUi.Editor
     [CustomPropertyDrawer(typeof(OverridableNavigation))]
     public class OverridableNavigationDrawer: PropertyDrawer
     {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+
+            // Draw label
+            position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label);
+
+            // Don't make child fields be indented
+            int indent = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+
+            // Calculate rects
+            var amountRect = new Rect(position.x, position.y, 200, position.height);
+            var unitRect = new Rect(position.x + 35, position.y, 200, position.height);
+
+            // Draw fields - pass GUIContent.none to each so they are drawn without labels
+            EditorGUI.PropertyField(amountRect, property.FindAutoPropertyRelative(nameof(OverridableNavigation.Override)), GUIContent.none);
+            EditorGUI.PropertyField(unitRect, property.FindAutoPropertyRelative(nameof(OverridableNavigation.Selectable)), GUIContent.none);
+
+            // Set indent back to what it was
+            EditorGUI.indentLevel = indent;
+
+            EditorGUI.EndProperty();
+        }
+
         public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
             var container = new VisualElement()
diff --git a/NEG/UI/UnityUi/MonoUiManager.cs b/NEG/UI/UnityUi/MonoUiManager.cs
index 041325c..4fd003d 100644
--- a/NEG/UI/UnityUi/MonoUiManager.cs
+++ b/NEG/UI/UnityUi/MonoUiManager.cs
@@ -24,7 +24,8 @@ namespace NEG.UI.UnityUi
         //TODO: use default unity selection
         //TODO: window snaping to slots
         public static new MonoUiManager Instance { get; private set; }
-        
+
+        public ButtonSettings DefaultUiSettings { get; }
         public KeyBasedFactory<string, ButtonElementBehaviour> BehavioursFactory { get; private set; }
         
         //TODO: editor to auto add slots, buttons 
@@ -34,7 +35,7 @@ namespace NEG.UI.UnityUi
 
         private UiInputModule inputModule;
 
-        public MonoUiManager(IArea startArea, Type inputModuleType) : base(startArea)
+        public MonoUiManager(IArea startArea, Type inputModuleType, ButtonSettings defaultUiSettings) : base(startArea)
         {
             Instance = this;
             
@@ -58,6 +59,7 @@ namespace NEG.UI.UnityUi
             BehavioursFactory.FireRegistration();
 
             inputModule = (UiInputModule)Activator.CreateInstance(inputModuleType);
+            DefaultUiSettings = defaultUiSettings;
         }
 
         public override void Dispose()
diff --git a/NEG/UI/UnityUi/Popup/MonoPopup.cs b/NEG/UI/UnityUi/Popup/MonoPopup.cs
index eb51396..2a7a2a3 100644
--- a/NEG/UI/UnityUi/Popup/MonoPopup.cs
+++ b/NEG/UI/UnityUi/Popup/MonoPopup.cs
@@ -10,13 +10,13 @@ namespace NEG.UI.UnityUi.Popup
         
         protected PopupData data;
 
-        public void Show(PopupData data)
+        public virtual void Show(PopupData data)
         {
             this.data = data;
             gameObject.SetActive(true);
         }
 
-        public void Close(bool silent = false)
+        public virtual void Close(bool silent = false)
         {
             gameObject.SetActive(false);
             
diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index 147239a..d905ac4 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -48,14 +48,18 @@ namespace NEG.UI.UnityUi.Window
                 controller.OnClosed();
         }
 
-        private void Awake() => ((IWindow)this).SetClosedState();
+        public void SetHiddenState() => gameObject.SetActive(false);
+
+        public void SeVisibleState() => gameObject.SetActive(true);
+
+        private void Awake() => ((IWindow)this).SetHiddenState();
 
         private void OnValidate()
         {
             if (controller == null)
                 controller = GetComponent<WindowController>();
             if(defaultSelectedItem == null)
-                Debug.LogWarning("Window should have default selected item set");
+                Debug.LogWarning($"Window {name} should have default selected item set");
         }
 
         public void OpenWindow(IWindow window, object data = null)
@@ -63,5 +67,7 @@ namespace NEG.UI.UnityUi.Window
             DefaultWindowSlot.AttachWindow(window);
             window.SetData(data);
         }
+
+        public void SetDefaultSelectedItem(GameObject item) => defaultSelectedItem = item;
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs b/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs
index 9c1a910..49c94da 100644
--- a/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs
+++ b/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs
@@ -1,4 +1,5 @@
-using NEG.UI.Area;
+using KBCore.Refs;
+using NEG.UI.Area;
 using NEG.UI.Window;
 using NEG.UI.WindowSlot;
 using System;
diff --git a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
new file mode 100644
index 0000000..facab85
--- /dev/null
+++ b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
@@ -0,0 +1,54 @@
+using NEG.UI.UnityUi.WindowSlot;
+using NEG.UI.Window;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NegUtils.NEG.UI.UnityUi.WindowSlot
+{
+    public class SingleWindowSlotWithHistory : MonoWindowSlot
+    {
+        public IWindow CurrentWindow
+        {
+            get => currentWindow;
+            set
+            {
+                if (value == null)
+                {
+                    CloseAllWindows();
+                    return;
+                }
+                
+                currentWindow?.SetHiddenState();
+                currentWindow = value;
+                windowsHistory.Add(currentWindow);
+                currentWindow?.SetOpenedState(this);
+            }
+        }
+        
+        private IWindow currentWindow;
+
+        private readonly List<IWindow> windowsHistory = new List<IWindow>();
+
+        public override void AttachWindow(IWindow window) => CurrentWindow = window;
+
+        public override void DetachWindow(IWindow window)
+        {
+            if(window == null) 
+                return;
+            window.SetClosedState();
+            windowsHistory.Remove(window);
+            if (window != currentWindow || windowsHistory.Count == 0) return;
+            windowsHistory[^1].SeVisibleState();
+            currentWindow = windowsHistory[^1];
+        }
+        public override void CloseAllWindows()
+        {
+            currentWindow = null;
+            foreach (var window in windowsHistory)
+            {
+                window.SetClosedState();
+            }
+            windowsHistory.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs.meta b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs.meta
new file mode 100644
index 0000000..9ec293e
--- /dev/null
+++ b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d98305dbca084b218b635682f06b934b
+timeCreated: 1685995642
\ No newline at end of file
diff --git a/NEG/UI/Window/IWindow.cs b/NEG/UI/Window/IWindow.cs
index 567bc7f..9495701 100644
--- a/NEG/UI/Window/IWindow.cs
+++ b/NEG/UI/Window/IWindow.cs
@@ -28,6 +28,16 @@ namespace NEG.UI.Window
         /// Called internally to close window by slot.
         /// </summary>
         void SetClosedState();
+        
+        /// <summary>
+        /// Called internally to hide window by slot.
+        /// </summary>
+        void SetHiddenState();
+        
+        /// <summary>
+        /// Called internally to set window visible by slot.
+        /// </summary>
+        void SeVisibleState();
     }
 
     public static class WindowInterfaceExtensions

From 34807988d8d3730ce43f458c163539e4d5a36d5e Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Mon, 12 Jun 2023 19:33:57 +0200
Subject: [PATCH 11/20] add define

---
 NEG/UI/UnityUi/MonoUiManager.cs     | 1 +
 NEG/UI/UnityUi/Window/MonoWindow.cs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/NEG/UI/UnityUi/MonoUiManager.cs b/NEG/UI/UnityUi/MonoUiManager.cs
index 4fd003d..06388f5 100644
--- a/NEG/UI/UnityUi/MonoUiManager.cs
+++ b/NEG/UI/UnityUi/MonoUiManager.cs
@@ -18,6 +18,7 @@ namespace NEG.UI.UnityUi
     /// <para>You have to provide prefabs within resources:</para>
     /// <para> - UI/PopupCanvas - prefab with canvas to create popups (will be created on every scene)</para>
     /// <para> - UI/DefaultPopupPrefab - prefab of default popup with 2 options (has to have <see cref="MonoDefaultPopup"/> component)</para>
+    /// NEG_UI_DISABLE_WARNING_DEFAULT_SELECTION
     /// </summary>
     public class MonoUiManager : UiManager, IDisposable
     {
diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index d905ac4..664971b 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -58,8 +58,10 @@ namespace NEG.UI.UnityUi.Window
         {
             if (controller == null)
                 controller = GetComponent<WindowController>();
+            #if !NEG_UI_DISABLE_WARNING_DEFAULT_SELECTION
             if(defaultSelectedItem == null)
                 Debug.LogWarning($"Window {name} should have default selected item set");
+            #endif
         }
 
         public void OpenWindow(IWindow window, object data = null)

From 17f48f7eb282699b64d306a38b6600d16fb73413 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Fri, 30 Jun 2023 13:41:43 +0200
Subject: [PATCH 12/20] update

---
 Editor/ScreenshotMaker.cs           | 21 +++++++++++++++++++++
 Editor/ScreenshotMaker.cs.meta      |  3 +++
 Editor/TsvImporter.cs               | 16 ++++++++++++++++
 Editor/TsvImporter.cs.meta          | 11 +++++++++++
 NEG/UI/UnityUi/MonoUiInputManger.cs |  8 +++++++-
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 Editor/ScreenshotMaker.cs
 create mode 100644 Editor/ScreenshotMaker.cs.meta
 create mode 100644 Editor/TsvImporter.cs
 create mode 100644 Editor/TsvImporter.cs.meta

diff --git a/Editor/ScreenshotMaker.cs b/Editor/ScreenshotMaker.cs
new file mode 100644
index 0000000..7304f1c
--- /dev/null
+++ b/Editor/ScreenshotMaker.cs
@@ -0,0 +1,21 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace NEG.Editor
+{
+    public static class ScreenshotMaker
+    {
+        [MenuItem("CONTEXT/Camera/Save view")]
+        public static void Capture(MenuCommand command)
+        {
+            string path = EditorUtility.SaveFilePanel("Save screenshot", "", "screen.png", "png");
+            if (path.Length == 0)
+                return;
+
+            ScreenCapture.CaptureScreenshot(path);
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Editor/ScreenshotMaker.cs.meta b/Editor/ScreenshotMaker.cs.meta
new file mode 100644
index 0000000..1cf608a
--- /dev/null
+++ b/Editor/ScreenshotMaker.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7dba407e8e8740a1bed3ee5fa833b13c
+timeCreated: 1687881092
\ No newline at end of file
diff --git a/Editor/TsvImporter.cs b/Editor/TsvImporter.cs
new file mode 100644
index 0000000..77299f5
--- /dev/null
+++ b/Editor/TsvImporter.cs
@@ -0,0 +1,16 @@
+using System.IO;
+using UnityEditor;
+using UnityEditor.AssetImporters;
+using UnityEditor.Experimental.AssetImporters;
+using UnityEngine;
+ 
+[ScriptedImporter(1, "tsv")]
+public class TsvImporter : ScriptedImporter
+{
+    public override void OnImportAsset(AssetImportContext ctx)
+    {
+        var textAsset = new TextAsset(File.ReadAllText(ctx.assetPath));
+        ctx.AddObjectToAsset(Path.GetFileNameWithoutExtension(ctx.assetPath), textAsset);
+        ctx.SetMainObject(textAsset);
+    }
+}
diff --git a/Editor/TsvImporter.cs.meta b/Editor/TsvImporter.cs.meta
new file mode 100644
index 0000000..cc19afd
--- /dev/null
+++ b/Editor/TsvImporter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b3f8438db4084014bab0a063e4675d3f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/NEG/UI/UnityUi/MonoUiInputManger.cs b/NEG/UI/UnityUi/MonoUiInputManger.cs
index 1285f13..22cd060 100644
--- a/NEG/UI/UnityUi/MonoUiInputManger.cs
+++ b/NEG/UI/UnityUi/MonoUiInputManger.cs
@@ -62,7 +62,13 @@ namespace NEG.UI.UnityUi
         {
             CurrentSelectionSource = SelectionSource.Pointer;
             Cursor.visible = true;
-            
+
+            if (EventSystem.current == null)
+            {
+                SetDirectionInput();
+                return;
+            }
+
             if (EventSystem.current.currentInputModule == null) 
                 return;
             

From 9e60fdf32d4597e938a94c4da77ed71bbfcfd05e Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Mon, 31 Jul 2023 11:05:57 +0200
Subject: [PATCH 13/20] fix popup show

---
 NEG/UI/UiManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEG/UI/UiManager.cs b/NEG/UI/UiManager.cs
index 8e315cc..c0fb864 100644
--- a/NEG/UI/UiManager.cs
+++ b/NEG/UI/UiManager.cs
@@ -151,7 +151,7 @@ namespace NEG.UI
         {
             if (forceShow)
             {
-                if(currentShownPopup.priority <= priority)
+                if(currentShownPopup.data != null && currentShownPopup.priority >= priority)
                     return;
                 
                 popupsToShow.Enqueue(currentShownPopup.data, currentShownPopup.priority);
@@ -163,6 +163,8 @@ namespace NEG.UI
             {
                 if(!d.IsValid)
                     continue;
+                if(d == currentShownPopup.data)
+                    continue;
                 ShowPopup(d, p);
                 return;
             }

From 9c91269a9e748b4a589849d5f76ad39946996a0e Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sat, 12 Aug 2023 11:14:57 +0200
Subject: [PATCH 14/20] New componnets

---
 NEG/UI/Area/IArea.cs                          |  4 +--
 NEG/UI/IControllable.cs                       | 23 ++++++++++++++
 NEG/UI/IControllable.cs.meta                  |  3 ++
 NEG/UI/IController.cs                         | 11 +++++++
 NEG/UI/IController.cs.meta                    |  3 ++
 NEG/UI/UiManager.cs                           | 22 ++++++++++++++
 NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs  | 27 +++++++++++++++++
 .../Area/CloseMainWindowOnBack.cs.meta        |  3 ++
 NEG/UI/UnityUi/Area/MonoArea.cs               | 18 +++++++----
 .../UnityUi/Buttons/OpenAsCurrentMainChild.cs | 15 ++++++++++
 .../Buttons/OpenAsCurrentMainChild.cs.meta    |  3 ++
 NEG/UI/UnityUi/Window/CloseWindowOnBack.cs    | 30 +++++++++++++++++++
 .../UnityUi/Window/CloseWindowOnBack.cs.meta  |  3 ++
 NEG/UI/UnityUi/Window/MonoWindow.cs           | 29 ++++++++++--------
 NEG/UI/UnityUi/Window/WindowController.cs     | 25 ++++++++++------
 NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs   |  2 +-
 NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs |  7 ++++-
 .../WindowSlot/SingleWindowSlotWithHistory.cs |  6 +++-
 NEG/UI/Window/IWindow.cs                      | 14 ++++-----
 NEG/UI/WindowSlot/IWindowSlot.cs              |  4 +--
 20 files changed, 209 insertions(+), 43 deletions(-)
 create mode 100644 NEG/UI/IControllable.cs
 create mode 100644 NEG/UI/IControllable.cs.meta
 create mode 100644 NEG/UI/IController.cs
 create mode 100644 NEG/UI/IController.cs.meta
 create mode 100644 NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
 create mode 100644 NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs.meta
 create mode 100644 NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs
 create mode 100644 NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs.meta
 create mode 100644 NEG/UI/UnityUi/Window/CloseWindowOnBack.cs
 create mode 100644 NEG/UI/UnityUi/Window/CloseWindowOnBack.cs.meta

diff --git a/NEG/UI/Area/IArea.cs b/NEG/UI/Area/IArea.cs
index 4c84e27..d542ee6 100644
--- a/NEG/UI/Area/IArea.cs
+++ b/NEG/UI/Area/IArea.cs
@@ -1,9 +1,9 @@
 using NEG.UI.WindowSlot;
+using NegUtils.NEG.UI;
 
 namespace NEG.UI.Area
 {
-    public interface IArea : ISlotsHolder, IUiElement
+    public interface IArea : ISlotsHolder, IUiElement, IControllable
     {
-        
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/IControllable.cs b/NEG/UI/IControllable.cs
new file mode 100644
index 0000000..e030148
--- /dev/null
+++ b/NEG/UI/IControllable.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace NegUtils.NEG.UI
+{
+    public interface IControllable
+    {
+        public class BackUsed
+        {
+            public bool Used { get; set; }
+        }
+        
+        event Action<object> OnOpened; 
+        event Action OnClosed;
+        /// <summary>
+        /// 
+        /// </summary>
+        event Action<BackUsed> UseBack;
+
+        public void FireOpenCallback(object data);
+        public void FireOnClosed();
+        public void FireUseBack(ref BackUsed backUsed);
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/IControllable.cs.meta b/NEG/UI/IControllable.cs.meta
new file mode 100644
index 0000000..d595b1d
--- /dev/null
+++ b/NEG/UI/IControllable.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 175798310e4048eda768cf40e6ee6de3
+timeCreated: 1686596400
\ No newline at end of file
diff --git a/NEG/UI/IController.cs b/NEG/UI/IController.cs
new file mode 100644
index 0000000..a48a051
--- /dev/null
+++ b/NEG/UI/IController.cs
@@ -0,0 +1,11 @@
+namespace NegUtils.NEG.UI
+{
+    public interface IController
+    {
+        void OnOpened(object data);
+
+        void OnClosed();
+
+        void UseBack(IControllable.BackUsed backUsed);
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/IController.cs.meta b/NEG/UI/IController.cs.meta
new file mode 100644
index 0000000..f16c28d
--- /dev/null
+++ b/NEG/UI/IController.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b88f4a93020a4bc6bde40e0438d296a9
+timeCreated: 1686595825
\ No newline at end of file
diff --git a/NEG/UI/UiManager.cs b/NEG/UI/UiManager.cs
index 8e315cc..9c53e00 100644
--- a/NEG/UI/UiManager.cs
+++ b/NEG/UI/UiManager.cs
@@ -3,6 +3,7 @@ using NEG.UI.Area;
 using NEG.UI.Popup;
 using NEG.UI.Window;
 using NEG.Utils;
+using NegUtils.NEG.UI;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -125,6 +126,17 @@ namespace NEG.UI
             UpdatePopupsState(forceShow, priority, data);
         }
 
+        public void UseBack()
+        {
+            IControllable.BackUsed backUsed = new();
+
+            CurrentMainWindow?.FireUseBack(ref backUsed);
+            if(backUsed.Used)
+                return;
+            CurrentArea.FireUseBack(ref backUsed);
+        }
+        
+
         public void RefreshPopups()
         {
             if(currentShownPopup.data is { IsValid: true })
@@ -134,6 +146,16 @@ namespace NEG.UI
 
         public virtual void Dispose() => Instance = null;
 
+        public void SetMainWindow(IWindow window) => CurrentMainWindow = window;
+
+        public void OnWindowClosed(IWindow window)
+        {
+            if(CurrentMainWindow != window)
+                return;
+            
+            //TODO: select new main window
+        }
+
         protected void PopupClosed(PopupData data)
         {
             if (currentShownPopup.data != data)
diff --git a/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
new file mode 100644
index 0000000..00a0b70
--- /dev/null
+++ b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
@@ -0,0 +1,27 @@
+using NEG.UI.Window;
+using NegUtils.NEG.UI;
+using UnityEngine;
+
+namespace NEG.UI.Area
+{
+    public class CloseMainWindowOnBack : MonoBehaviour, IController
+    {
+        private IControllable controllable;
+        
+        public void OnOpened(object data) { }
+
+        public void OnClosed() { }
+        
+        public void UseBack(IControllable.BackUsed backUsed)
+        {
+            UiManager.Instance.CurrentMainWindow.Close();
+            backUsed.Used = true;
+        }
+
+        private void Awake()
+        {
+            controllable = GetComponent<IControllable>();
+            controllable.UseBack += UseBack;
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs.meta b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs.meta
new file mode 100644
index 0000000..4260da6
--- /dev/null
+++ b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6ec2bf64cda740a1849d024d4f163a01
+timeCreated: 1686598066
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Area/MonoArea.cs b/NEG/UI/UnityUi/Area/MonoArea.cs
index e5f92b0..b79a409 100644
--- a/NEG/UI/UnityUi/Area/MonoArea.cs
+++ b/NEG/UI/UnityUi/Area/MonoArea.cs
@@ -5,12 +5,17 @@ using NEG.UI.UnityUi.Window;
 using NEG.UI.UnityUi.WindowSlot;
 using NEG.UI.Window;
 using NEG.UI.WindowSlot;
+using NegUtils.NEG.UI;
 using System;
 
 namespace NEG.UI.Area
 {
     public class MonoArea : MonoBehaviour, IArea
     {
+        public event Action<object> OnOpened;
+        public event Action OnClosed;
+        public event Action<IControllable.BackUsed> UseBack;
+        
         public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
         public IWindowSlot DefaultWindowSlot => windowSlots[0];
         
@@ -20,11 +25,7 @@ namespace NEG.UI.Area
 
         public virtual void SetEnabled(bool setEnabled) => gameObject.SetActive(setEnabled);
 
-        public virtual void OpenWindow(IWindow window, object data = null)
-        {
-            DefaultWindowSlot.AttachWindow(window);
-            window.SetData(data);
-        }
+        public virtual void OpenWindow(IWindow window, object data = null) => DefaultWindowSlot.AttachWindow(window, data);
 
         protected virtual void Awake()
         {
@@ -37,5 +38,12 @@ namespace NEG.UI.Area
             if (ReferenceEquals(UiManager.Instance.CurrentArea, this))
                 UiManager.Instance.CurrentArea = null;
         }
+
+   
+        public void FireOpenCallback(object data) => OnOpened?.Invoke(data);
+
+        public void FireOnClosed() => OnClosed?.Invoke();
+
+        public void FireUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed);
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs b/NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs
new file mode 100644
index 0000000..1d9bcf2
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs
@@ -0,0 +1,15 @@
+using KBCore.Refs;
+using NEG.UI.UnityUi.Window;
+using NEG.UI.Window;
+using UnityEngine;
+
+namespace NEG.UI.UnityUi.Buttons
+{
+    public class OpenAsCurrentMainChild : ButtonReaction
+    {
+        [SerializeField]
+        private MonoWindow windowToOpen;
+
+        protected override void OnClicked() => UiManager.Instance.CurrentMainWindow.OpenAsChild(windowToOpen);
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs.meta b/NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs.meta
new file mode 100644
index 0000000..ac897a0
--- /dev/null
+++ b/NEG/UI/UnityUi/Buttons/OpenAsCurrentMainChild.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 049e222140c94fc28fb36bca4aaddba4
+timeCreated: 1686595194
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs
new file mode 100644
index 0000000..9e2cc9f
--- /dev/null
+++ b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs
@@ -0,0 +1,30 @@
+using KBCore.Refs;
+using NEG.UI.Window;
+using NegUtils.NEG.UI;
+using UnityEngine;
+
+namespace NEG.UI.UnityUi.Window
+{
+    public class CloseWindowOnBack : MonoBehaviour, IController
+    {
+        [SerializeField, Self(Flag.Editable)] private MonoWindow window;
+        
+        private IControllable controllable;
+
+        public void OnOpened(object data) { }
+
+        public void OnClosed() { }
+
+        public void UseBack(IControllable.BackUsed backUsed)
+        {
+            window.Close();
+            backUsed.Used = true;
+        }
+
+        private void Awake()
+        {
+            controllable = GetComponent<IControllable>();
+            controllable.UseBack += UseBack;
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs.meta b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs.meta
new file mode 100644
index 0000000..535a375
--- /dev/null
+++ b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b4a156da6df74abeb281176000738ebb
+timeCreated: 1686598323
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index 664971b..219265e 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -3,6 +3,7 @@ using NEG.UI.UnityUi.Buttons;
 using NEG.UI.UnityUi.WindowSlot;
 using NEG.UI.Window;
 using NEG.UI.WindowSlot;
+using NegUtils.NEG.UI;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -12,8 +13,13 @@ namespace NEG.UI.UnityUi.Window
 {
     public class MonoWindow : MonoBehaviour, IWindow
     {
+        public event Action<object> OnOpened;
+        public event Action OnClosed;
+        public event Action<IControllable.BackUsed> UseBack;
+        
         public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
         public IWindowSlot Parent { get; private set; }
+        public IController Controller { get; }
 
         public bool IsMainWindow { get; private set; }
         
@@ -29,14 +35,8 @@ namespace NEG.UI.UnityUi.Window
             gameObject.SetActive(true);
             Parent = parentSlot;
             EventSystem.current.SetSelectedGameObject(defaultSelectedItem);
-            if (controller != null) 
-                controller.OnOpened();
-        }
-
-        public void SetData(object data)
-        {
-            if (controller != null) 
-                controller.SetData(data);
+            if (parentSlot.OpenWindowAsMain)
+                UiManager.Instance.SetMainWindow(this);
         }
 
         public void SetClosedState()
@@ -44,6 +44,7 @@ namespace NEG.UI.UnityUi.Window
             gameObject.SetActive(false);
             Parent = null;
             ((ISlotsHolder)this).CloseAllWindows();
+            UiManager.Instance.OnWindowClosed(this);
             if(controller != null)
                 controller.OnClosed();
         }
@@ -64,12 +65,14 @@ namespace NEG.UI.UnityUi.Window
             #endif
         }
 
-        public void OpenWindow(IWindow window, object data = null)
-        {
-            DefaultWindowSlot.AttachWindow(window);
-            window.SetData(data);
-        }
+        public void OpenWindow(IWindow window, object data = null) => DefaultWindowSlot.AttachWindow(window, data);
 
         public void SetDefaultSelectedItem(GameObject item) => defaultSelectedItem = item;
+        
+        public void FireOpenCallback(object data) => OnOpened?.Invoke(data);
+
+        public void FireOnClosed() => OnClosed?.Invoke();
+        
+        public void FireUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed);
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/WindowController.cs b/NEG/UI/UnityUi/Window/WindowController.cs
index 6451e30..4be335c 100644
--- a/NEG/UI/UnityUi/Window/WindowController.cs
+++ b/NEG/UI/UnityUi/Window/WindowController.cs
@@ -1,20 +1,27 @@
-using System;
+using NegUtils.NEG.UI;
+using System;
 using UnityEngine;
 
 namespace NEG.UI.UnityUi.Window
 {
-    [RequireComponent(typeof(MonoWindow))]
-    //Due to prefab variants we need this
-    public abstract class WindowController : MonoBehaviour
+    public abstract class WindowController : MonoBehaviour, IController
     {
-        protected MonoWindow window;
-        
-        public abstract void SetData(object data);
+        protected IControllable controllable;
 
-        public virtual void OnOpened() { }
+        public virtual void OnOpened(object data) { }
 
         public virtual void OnClosed() { }
 
-        protected virtual void Awake() => window = GetComponent<MonoWindow>();
+        protected virtual void Awake()
+        {
+            controllable = GetComponent<IControllable>();
+            controllable.OnOpened += OnOpened;
+            controllable.OnClosed += OnClosed;
+            controllable.UseBack += UseBack;
+        }
+
+        public void UseBack(IControllable.BackUsed obj)
+        {
+        }
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs b/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs
index 49c94da..90fb9cf 100644
--- a/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs
+++ b/NEG/UI/UnityUi/WindowSlot/MonoWindowSlot.cs
@@ -13,7 +13,7 @@ namespace NEG.UI.UnityUi.WindowSlot
         [field: SerializeField] public bool OpenWindowAsMain { get; private set; }
         
         public ISlotsHolder ParentHolder => slotsHolder.Value;
-        public abstract void AttachWindow(IWindow window);
+        public abstract void AttachWindow(IWindow window, object data);
         public abstract void DetachWindow(IWindow window);
         public abstract void CloseAllWindows();
         
diff --git a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs
index b1b7841..023d734 100644
--- a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs
+++ b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs
@@ -19,7 +19,12 @@ namespace NEG.UI.WindowSlot
         
         private IWindow currentWindow;
         
-        public override void AttachWindow(IWindow window) => CurrentWindow = window;
+        public override void AttachWindow(IWindow window, object data)
+        {
+            CurrentWindow = window;
+            window.FireOpenCallback(data);
+        }
+
         public override void DetachWindow(IWindow window) => CurrentWindow = null;
         public override void CloseAllWindows() => CurrentWindow = null;
     }
diff --git a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
index facab85..300a09d 100644
--- a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
+++ b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
@@ -29,7 +29,11 @@ namespace NegUtils.NEG.UI.UnityUi.WindowSlot
 
         private readonly List<IWindow> windowsHistory = new List<IWindow>();
 
-        public override void AttachWindow(IWindow window) => CurrentWindow = window;
+        public override void AttachWindow(IWindow window, object data)
+        {
+            CurrentWindow = window;
+            CurrentWindow.FireOpenCallback(data);
+        }
 
         public override void DetachWindow(IWindow window)
         {
diff --git a/NEG/UI/Window/IWindow.cs b/NEG/UI/Window/IWindow.cs
index 9495701..095bc13 100644
--- a/NEG/UI/Window/IWindow.cs
+++ b/NEG/UI/Window/IWindow.cs
@@ -1,16 +1,19 @@
 using JetBrains.Annotations;
 using NEG.UI.Area;
 using NEG.UI.WindowSlot;
+using NegUtils.NEG.UI;
 using UnityEngine;
 
 namespace NEG.UI.Window
 {
-    public interface IWindow : ISlotsHolder
+    public interface IWindow : ISlotsHolder, IControllable
     {
         /// <summary>
         /// Parent slot of this window.
         /// </summary>
         IWindowSlot Parent { get; }
+        
+        IController Controller { get; }
 
         /// <summary>
         /// Called internally by slot to open window.
@@ -18,12 +21,6 @@ namespace NEG.UI.Window
         /// <param name="parentSlot">slot that opens window</param>
         void SetOpenedState(IWindowSlot parentSlot);
 
-        /// <summary>
-        /// Sets data for window, usually used for dynamic content set by external logic controller.
-        /// </summary>
-        /// <param name="data">can be any type, window should cast for expected type</param>
-        void SetData(object data);
-        
         /// <summary>
         /// Called internally to close window by slot.
         /// </summary>
@@ -52,8 +49,7 @@ namespace NEG.UI.Window
         {
             if (slot != null)
             {
-                slot.AttachWindow(window);
-                window.SetData(data);
+                slot.AttachWindow(window, data);
                 return;
             }
 
diff --git a/NEG/UI/WindowSlot/IWindowSlot.cs b/NEG/UI/WindowSlot/IWindowSlot.cs
index 07dfa27..8b06bbd 100644
--- a/NEG/UI/WindowSlot/IWindowSlot.cs
+++ b/NEG/UI/WindowSlot/IWindowSlot.cs
@@ -3,11 +3,11 @@ using NEG.UI.Window;
 
 namespace NEG.UI.WindowSlot
 {
-    public interface  IWindowSlot
+    public interface IWindowSlot
     {
         bool OpenWindowAsMain { get; }
         ISlotsHolder ParentHolder { get; }
-        void AttachWindow(IWindow window);
+        void AttachWindow(IWindow window, object data);
         void DetachWindow(IWindow window);
         void CloseAllWindows();
     }

From a83c4cfb3b6e8273a74c439d128bed68d1f16d8b Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Thu, 17 Aug 2023 10:47:21 +0200
Subject: [PATCH 15/20] Cleanup

---
 .../MultiSelectChips/MultiSelectChipItem.cs   |  8 +--
 .../MultiSelectChips/MultiSelectChips.cs      | 53 +++----------------
 UiToolkit/MultiSelectChips/Resources.meta     |  8 +++
 .../{ => Resources}/MultiSelectChipItem.uxml  |  0
 .../MultiSelectChipItem.uxml.meta             |  0
 .../{ => Resources}/MultiSelectChips.uxml     |  0
 .../MultiSelectChips.uxml.meta                |  0
 7 files changed, 17 insertions(+), 52 deletions(-)
 create mode 100644 UiToolkit/MultiSelectChips/Resources.meta
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChipItem.uxml (100%)
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChipItem.uxml.meta (100%)
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChips.uxml (100%)
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChips.uxml.meta (100%)

diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
index a5b6c96..74dd601 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
@@ -1,7 +1,4 @@
-#if ADDRESSABLES && UI_ELEMENTS
-using System.Collections;
-using UnityEngine;
-using UnityEngine.UIElements;
+using UnityEngine.UIElements;
 
 namespace NEG.Utils.UiToolkits
 {
@@ -22,5 +19,4 @@ namespace NEG.Utils.UiToolkits
             visualElement.Q<Button>("RemoveBtn").clicked += () => parent.TryRemoveItem(element);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.cs b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
index 6d63099..245d9bf 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChips.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
@@ -1,8 +1,5 @@
-#if ADDRESSABLES && UI_ELEMENTS
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
 using System.Collections.Generic;
 using System;
 using System.IO;
@@ -51,7 +48,6 @@ namespace NEG.Utils.UiToolkits
         }
 
         private Label label;
-        private AsyncOperationHandle<VisualTreeAsset> uxmlHandle, itemUxmlHandle;
 
         private VisualTreeAsset itemPrefab;
 
@@ -91,13 +87,11 @@ namespace NEG.Utils.UiToolkits
             string path = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets($"t:Script {nameof(MultiSelectChips)}")[0]);
             path = path.Remove(path.LastIndexOf('/'));
 
-            SetVisuals(AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/MultiSelectChips.uxml"));
-            itemPrefab = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/MultiSelectChipItem.uxml");
+            SetVisuals(AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/Resources/MultiSelectChips.uxml"));
+            itemPrefab = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/Resources/MultiSelectChipItem.uxml");
 #else
-            uxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChips.uxml");
-            itemUxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChipItem.uxml");
-            uxmlHandle.Completed += OnUxmlLoaded;
-            itemUxmlHandle.Completed += OnItemUxmlLoaded;
+            SetVisuals(Resources.Load<VisualTreeAsset>("MultiSelectChips.uxml"));
+            itemPrefab = Resources.Load<VisualTreeAsset>("MultiSelectChipItem.uxml");
 #endif
         }
 
@@ -106,7 +100,7 @@ namespace NEG.Utils.UiToolkits
             if (itemPrefab == null || itemsSource == null || realItemsParent == null)
                 return;
 
-            List<MultiSelectChipItem> itemsToDestroy = new List<MultiSelectChipItem>(spawnedItems);
+            var itemsToDestroy = new List<MultiSelectChipItem>(spawnedItems);
 
             itemsToDestroy.RemoveAll((x) => itemsSource.Contains(x.ChipItem));
 
@@ -132,10 +126,7 @@ namespace NEG.Utils.UiToolkits
             }
         }
 
-        public void TryRemoveItem(IMultiSelectChipItem item)
-        {
-            OnTryingToRemoveItem?.Invoke(item);
-        }
+        public void TryRemoveItem(IMultiSelectChipItem item) => OnTryingToRemoveItem?.Invoke(item);
 
         private void InitLabel()
         {
@@ -146,35 +137,6 @@ namespace NEG.Utils.UiToolkits
             Insert(0, label);
         }
 
-        private void OnUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
-        {
-            if (operation.Status == AsyncOperationStatus.Succeeded)
-            {
-                SetVisuals(operation.Result);
-                Addressables.Release(uxmlHandle);
-                UpdateItems();
-            }
-            else
-            {
-                Debug.LogError($"Asset failed to load.");
-            }
-        }
-
-        private void OnItemUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
-        {
-
-            if (operation.Status == AsyncOperationStatus.Succeeded)
-            {
-                itemPrefab = operation.Result;
-                Addressables.Release(itemUxmlHandle);
-                UpdateItems();
-            }
-            else
-            {
-                Debug.LogError($"Asset failed to load.");
-            }
-        }
-
         private void SetVisuals(VisualTreeAsset treeAsset)
         {
             realItemsParent = treeAsset.Instantiate();
@@ -187,5 +149,4 @@ namespace NEG.Utils.UiToolkits
             realItemsParent = button.parent;
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/UiToolkit/MultiSelectChips/Resources.meta b/UiToolkit/MultiSelectChips/Resources.meta
new file mode 100644
index 0000000..97a9dd6
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a807a09d7c00be478bf44636c2cc89f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml b/UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta b/UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml.meta
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml.meta
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.uxml b/UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChips.uxml
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.uxml.meta b/UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml.meta
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChips.uxml.meta
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml.meta

From 63d3d908e8baa5a7a7ac03dadfc641b0905c25f3 Mon Sep 17 00:00:00 2001
From: Kamila Stawarska <kamila.stawarska@gmail.com>
Date: Sun, 20 Aug 2023 14:07:45 +0200
Subject: [PATCH 16/20] Naming update

---
 NEG/UI/UnityUi/Area/MonoArea.cs               |  4 ++-
 NEG/UI/UnityUi/MonoController.cs              | 29 +++++++++++++++++++
 ...troller.cs.meta => MonoController.cs.meta} |  0
 NEG/UI/UnityUi/Window/MonoWindow.cs           | 11 +++----
 NEG/UI/UnityUi/Window/WindowController.cs     | 27 -----------------
 5 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 NEG/UI/UnityUi/MonoController.cs
 rename NEG/UI/UnityUi/{Window/WindowController.cs.meta => MonoController.cs.meta} (100%)
 delete mode 100644 NEG/UI/UnityUi/Window/WindowController.cs

diff --git a/NEG/UI/UnityUi/Area/MonoArea.cs b/NEG/UI/UnityUi/Area/MonoArea.cs
index b79a409..e603e89 100644
--- a/NEG/UI/UnityUi/Area/MonoArea.cs
+++ b/NEG/UI/UnityUi/Area/MonoArea.cs
@@ -10,7 +10,7 @@ using System;
 
 namespace NEG.UI.Area
 {
-    public class MonoArea : MonoBehaviour, IArea
+    public class MonoArea : MonoBehaviour, IArea, IControllable
     {
         public event Action<object> OnOpened;
         public event Action OnClosed;
@@ -31,6 +31,8 @@ namespace NEG.UI.Area
         {
             if (setAsDefaultArea)
                 UiManager.Instance.CurrentArea = this;
+            else
+                SetEnabled(false);
         }
 
         protected virtual void OnDestroy()
diff --git a/NEG/UI/UnityUi/MonoController.cs b/NEG/UI/UnityUi/MonoController.cs
new file mode 100644
index 0000000..d2d6640
--- /dev/null
+++ b/NEG/UI/UnityUi/MonoController.cs
@@ -0,0 +1,29 @@
+using KBCore.Refs;
+using NegUtils.NEG.UI;
+using System;
+using UnityEngine;
+
+namespace NEG.UI.UnityUi
+{
+    public abstract class MonoController : MonoBehaviour, IController
+    {
+        [SerializeField, Self] protected InterfaceRef<IControllable> controllable;
+
+        public virtual void OnOpened(object data) { }
+
+        public virtual void OnClosed() { }
+
+        protected virtual void Awake()
+        {
+            controllable.Value.OnOpened += OnOpened;
+            controllable.Value.OnClosed += OnClosed;
+            controllable.Value.UseBack += UseBack;
+        }
+        
+        private void OnValidate() => this.ValidateRefs();
+
+        public virtual void UseBack(IControllable.BackUsed obj)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/WindowController.cs.meta b/NEG/UI/UnityUi/MonoController.cs.meta
similarity index 100%
rename from NEG/UI/UnityUi/Window/WindowController.cs.meta
rename to NEG/UI/UnityUi/MonoController.cs.meta
diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index 219265e..8027e00 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.Serialization;
 
 namespace NEG.UI.UnityUi.Window
 {
@@ -26,7 +27,7 @@ namespace NEG.UI.UnityUi.Window
         private IWindowSlot DefaultWindowSlot => windowSlots[0];
         
         [SerializeField] private List<MonoWindowSlot> windowSlots;
-        [SerializeField] private WindowController controller;
+        [SerializeField] private MonoController monoController;
 
         [SerializeField] private GameObject defaultSelectedItem;
 
@@ -45,8 +46,8 @@ namespace NEG.UI.UnityUi.Window
             Parent = null;
             ((ISlotsHolder)this).CloseAllWindows();
             UiManager.Instance.OnWindowClosed(this);
-            if(controller != null)
-                controller.OnClosed();
+            if(monoController != null)
+                monoController.OnClosed();
         }
 
         public void SetHiddenState() => gameObject.SetActive(false);
@@ -57,8 +58,8 @@ namespace NEG.UI.UnityUi.Window
 
         private void OnValidate()
         {
-            if (controller == null)
-                controller = GetComponent<WindowController>();
+            if (monoController == null)
+                monoController = GetComponent<MonoController>();
             #if !NEG_UI_DISABLE_WARNING_DEFAULT_SELECTION
             if(defaultSelectedItem == null)
                 Debug.LogWarning($"Window {name} should have default selected item set");
diff --git a/NEG/UI/UnityUi/Window/WindowController.cs b/NEG/UI/UnityUi/Window/WindowController.cs
deleted file mode 100644
index 4be335c..0000000
--- a/NEG/UI/UnityUi/Window/WindowController.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using NegUtils.NEG.UI;
-using System;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Window
-{
-    public abstract class WindowController : MonoBehaviour, IController
-    {
-        protected IControllable controllable;
-
-        public virtual void OnOpened(object data) { }
-
-        public virtual void OnClosed() { }
-
-        protected virtual void Awake()
-        {
-            controllable = GetComponent<IControllable>();
-            controllable.OnOpened += OnOpened;
-            controllable.OnClosed += OnClosed;
-            controllable.UseBack += UseBack;
-        }
-
-        public void UseBack(IControllable.BackUsed obj)
-        {
-        }
-    }
-}
\ No newline at end of file

From 33d0a9078f7e4a5e55850482f9291bcaf408dd80 Mon Sep 17 00:00:00 2001
From: Kamila Stawarska <kamila.stawarska@gmail.com>
Date: Sat, 26 Aug 2023 01:03:34 +0200
Subject: [PATCH 17/20] Fixed for avoiding scripts execution order

---
 NEG/UI/UnityUi/Area/MonoArea.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEG/UI/UnityUi/Area/MonoArea.cs b/NEG/UI/UnityUi/Area/MonoArea.cs
index e603e89..8b46887 100644
--- a/NEG/UI/UnityUi/Area/MonoArea.cs
+++ b/NEG/UI/UnityUi/Area/MonoArea.cs
@@ -31,7 +31,11 @@ namespace NEG.UI.Area
         {
             if (setAsDefaultArea)
                 UiManager.Instance.CurrentArea = this;
-            else
+        }
+
+        protected void Start()
+        {
+            if(!setAsDefaultArea)
                 SetEnabled(false);
         }
 

From fb90337a3fc6f5f88765429c967bd9a3e26fcdb1 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Fri, 1 Sep 2023 21:42:37 +0200
Subject: [PATCH 18/20] final update befor pr

---
 NEG/UI/Area/IArea.cs                          |  4 ++-
 NEG/UI/IControllable.cs                       |  9 ++----
 NEG/UI/IController.cs                         |  6 +---
 NEG/UI/IUiElement.cs                          | 11 -------
 NEG/UI/IUiElement.cs.meta                     |  3 --
 NEG/UI/UiManager.cs                           |  8 ++---
 NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs  | 22 ++++---------
 NEG/UI/UnityUi/Area/MonoArea.cs               | 32 +++++++++++--------
 NEG/UI/UnityUi/MonoController.cs              | 16 +++++-----
 NEG/UI/UnityUi/Window/CloseWindowOnBack.cs    | 17 ++--------
 NEG/UI/UnityUi/Window/MonoWindow.cs           | 16 +++-------
 NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs |  5 ++-
 .../WindowSlot/SingleWindowSlotWithHistory.cs |  3 +-
 NEG/UI/Window/IWindow.cs                      |  5 ++-
 14 files changed, 55 insertions(+), 102 deletions(-)
 delete mode 100644 NEG/UI/IUiElement.cs
 delete mode 100644 NEG/UI/IUiElement.cs.meta

diff --git a/NEG/UI/Area/IArea.cs b/NEG/UI/Area/IArea.cs
index d542ee6..11f0559 100644
--- a/NEG/UI/Area/IArea.cs
+++ b/NEG/UI/Area/IArea.cs
@@ -3,7 +3,9 @@ using NegUtils.NEG.UI;
 
 namespace NEG.UI.Area
 {
-    public interface IArea : ISlotsHolder, IUiElement, IControllable
+    public interface IArea : ISlotsHolder, IControllable
     {
+        void Open();
+        void Close();
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/IControllable.cs b/NEG/UI/IControllable.cs
index e030148..9fbc5e1 100644
--- a/NEG/UI/IControllable.cs
+++ b/NEG/UI/IControllable.cs
@@ -11,13 +11,8 @@ namespace NegUtils.NEG.UI
         
         event Action<object> OnOpened; 
         event Action OnClosed;
-        /// <summary>
-        /// 
-        /// </summary>
         event Action<BackUsed> UseBack;
-
-        public void FireOpenCallback(object data);
-        public void FireOnClosed();
-        public void FireUseBack(ref BackUsed backUsed);
+        
+        public void TryUseBack(ref BackUsed backUsed);
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/IController.cs b/NEG/UI/IController.cs
index a48a051..ddb99ff 100644
--- a/NEG/UI/IController.cs
+++ b/NEG/UI/IController.cs
@@ -2,10 +2,6 @@
 {
     public interface IController
     {
-        void OnOpened(object data);
-
-        void OnClosed();
-
-        void UseBack(IControllable.BackUsed backUsed);
+        IControllable Controllable { get; }
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/IUiElement.cs b/NEG/UI/IUiElement.cs
deleted file mode 100644
index 6cfde2b..0000000
--- a/NEG/UI/IUiElement.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace NEG.UI
-{
-    public interface IUiElement
-    {
-        /// <summary>
-        /// Sets only visible state of element
-        /// </summary>
-        /// <param name="setEnabled"></param>
-        void SetEnabled(bool setEnabled);
-    }
-}
\ No newline at end of file
diff --git a/NEG/UI/IUiElement.cs.meta b/NEG/UI/IUiElement.cs.meta
deleted file mode 100644
index 765fb83..0000000
--- a/NEG/UI/IUiElement.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 296bf6969a6347f8aea788a7bdd086af
-timeCreated: 1670693177
\ No newline at end of file
diff --git a/NEG/UI/UiManager.cs b/NEG/UI/UiManager.cs
index 048b860..c25e4b3 100644
--- a/NEG/UI/UiManager.cs
+++ b/NEG/UI/UiManager.cs
@@ -23,11 +23,11 @@ namespace NEG.UI
             get => currentArea;
             set
             {
-                currentArea?.SetEnabled(false);
+                currentArea?.Close();
 
                 currentArea = value;
 
-                currentArea?.SetEnabled(true);
+                currentArea?.Open();
             }
         }
         
@@ -130,10 +130,10 @@ namespace NEG.UI
         {
             IControllable.BackUsed backUsed = new();
 
-            CurrentMainWindow?.FireUseBack(ref backUsed);
+            CurrentMainWindow?.TryUseBack(ref backUsed);
             if(backUsed.Used)
                 return;
-            CurrentArea.FireUseBack(ref backUsed);
+            CurrentArea.TryUseBack(ref backUsed);
         }
         
 
diff --git a/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
index 00a0b70..feb80a7 100644
--- a/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
+++ b/NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs
@@ -1,27 +1,19 @@
-using NEG.UI.Window;
+using KBCore.Refs;
+using NEG.UI.UnityUi;
+using NEG.UI.Window;
 using NegUtils.NEG.UI;
+using System;
 using UnityEngine;
 
 namespace NEG.UI.Area
 {
-    public class CloseMainWindowOnBack : MonoBehaviour, IController
+    public class CloseMainWindowOnBack : MonoController
     {
-        private IControllable controllable;
-        
-        public void OnOpened(object data) { }
-
-        public void OnClosed() { }
-        
-        public void UseBack(IControllable.BackUsed backUsed)
+        protected override void UseBack(IControllable.BackUsed backUsed)
         {
+            base.UseBack(backUsed);
             UiManager.Instance.CurrentMainWindow.Close();
             backUsed.Used = true;
         }
-
-        private void Awake()
-        {
-            controllable = GetComponent<IControllable>();
-            controllable.UseBack += UseBack;
-        }
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Area/MonoArea.cs b/NEG/UI/UnityUi/Area/MonoArea.cs
index 8b46887..f6d2d6f 100644
--- a/NEG/UI/UnityUi/Area/MonoArea.cs
+++ b/NEG/UI/UnityUi/Area/MonoArea.cs
@@ -10,7 +10,7 @@ using System;
 
 namespace NEG.UI.Area
 {
-    public class MonoArea : MonoBehaviour, IArea, IControllable
+    public class MonoArea : MonoBehaviour, IArea
     {
         public event Action<object> OnOpened;
         public event Action OnClosed;
@@ -22,34 +22,38 @@ namespace NEG.UI.Area
         [SerializeField] private bool setAsDefaultArea;
 
         [SerializeField] private List<MonoWindowSlot> windowSlots;
+        
+        public void Open()
+        {
+            gameObject.SetActive(true);
+            OnOpened?.Invoke(null);
+        }
 
-        public virtual void SetEnabled(bool setEnabled) => gameObject.SetActive(setEnabled);
+        public void Close(){
+            gameObject.SetActive(false);
+            OnClosed?.Invoke();
+        }
+        
+        public void OpenWindow(IWindow window, object data = null) => DefaultWindowSlot.AttachWindow(window, data);
 
-        public virtual void OpenWindow(IWindow window, object data = null) => DefaultWindowSlot.AttachWindow(window, data);
-
-        protected virtual void Awake()
+        private void Awake()
         {
             if (setAsDefaultArea)
                 UiManager.Instance.CurrentArea = this;
         }
 
-        protected void Start()
+        private void Start()
         {
             if(!setAsDefaultArea)
-                SetEnabled(false);
+                Close();
         }
 
-        protected virtual void OnDestroy()
+        private void OnDestroy()
         {
             if (ReferenceEquals(UiManager.Instance.CurrentArea, this))
                 UiManager.Instance.CurrentArea = null;
         }
 
-   
-        public void FireOpenCallback(object data) => OnOpened?.Invoke(data);
-
-        public void FireOnClosed() => OnClosed?.Invoke();
-
-        public void FireUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed);
+        public void TryUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed);
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/MonoController.cs b/NEG/UI/UnityUi/MonoController.cs
index d2d6640..79d538a 100644
--- a/NEG/UI/UnityUi/MonoController.cs
+++ b/NEG/UI/UnityUi/MonoController.cs
@@ -7,12 +7,10 @@ namespace NEG.UI.UnityUi
 {
     public abstract class MonoController : MonoBehaviour, IController
     {
+        public IControllable Controllable => controllable.Value;
+
         [SerializeField, Self] protected InterfaceRef<IControllable> controllable;
-
-        public virtual void OnOpened(object data) { }
-
-        public virtual void OnClosed() { }
-
+        
         protected virtual void Awake()
         {
             controllable.Value.OnOpened += OnOpened;
@@ -21,9 +19,11 @@ namespace NEG.UI.UnityUi
         }
         
         private void OnValidate() => this.ValidateRefs();
+        
+        protected virtual void OnOpened(object data) { }
 
-        public virtual void UseBack(IControllable.BackUsed obj)
-        {
-        }
+        protected virtual void OnClosed() { }
+        
+        protected virtual void UseBack(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 9e2cc9f..bdc9bef 100644
--- a/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs
+++ b/NEG/UI/UnityUi/Window/CloseWindowOnBack.cs
@@ -5,26 +5,15 @@ using UnityEngine;
 
 namespace NEG.UI.UnityUi.Window
 {
-    public class CloseWindowOnBack : MonoBehaviour, IController
+    public class CloseWindowOnBack : MonoController
     {
         [SerializeField, Self(Flag.Editable)] private MonoWindow window;
-        
-        private IControllable controllable;
 
-        public void OnOpened(object data) { }
-
-        public void OnClosed() { }
-
-        public void UseBack(IControllable.BackUsed backUsed)
+        protected override void UseBack(IControllable.BackUsed backUsed)
         {
+            base.UseBack(backUsed);
             window.Close();
             backUsed.Used = true;
         }
-
-        private void Awake()
-        {
-            controllable = GetComponent<IControllable>();
-            controllable.UseBack += UseBack;
-        }
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/Window/MonoWindow.cs b/NEG/UI/UnityUi/Window/MonoWindow.cs
index 8027e00..b9b400d 100644
--- a/NEG/UI/UnityUi/Window/MonoWindow.cs
+++ b/NEG/UI/UnityUi/Window/MonoWindow.cs
@@ -20,24 +20,23 @@ namespace NEG.UI.UnityUi.Window
         
         public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
         public IWindowSlot Parent { get; private set; }
-        public IController Controller { get; }
 
         public bool IsMainWindow { get; private set; }
         
         private IWindowSlot DefaultWindowSlot => windowSlots[0];
         
         [SerializeField] private List<MonoWindowSlot> windowSlots;
-        [SerializeField] private MonoController monoController;
 
         [SerializeField] private GameObject defaultSelectedItem;
 
-        public void SetOpenedState(IWindowSlot parentSlot)
+        public void SetOpenedState(IWindowSlot parentSlot, object data)
         {
             gameObject.SetActive(true);
             Parent = parentSlot;
             EventSystem.current.SetSelectedGameObject(defaultSelectedItem);
             if (parentSlot.OpenWindowAsMain)
                 UiManager.Instance.SetMainWindow(this);
+            OnOpened?.Invoke(data);
         }
 
         public void SetClosedState()
@@ -46,8 +45,7 @@ namespace NEG.UI.UnityUi.Window
             Parent = null;
             ((ISlotsHolder)this).CloseAllWindows();
             UiManager.Instance.OnWindowClosed(this);
-            if(monoController != null)
-                monoController.OnClosed();
+            OnClosed?.Invoke();
         }
 
         public void SetHiddenState() => gameObject.SetActive(false);
@@ -58,8 +56,6 @@ namespace NEG.UI.UnityUi.Window
 
         private void OnValidate()
         {
-            if (monoController == null)
-                monoController = GetComponent<MonoController>();
             #if !NEG_UI_DISABLE_WARNING_DEFAULT_SELECTION
             if(defaultSelectedItem == null)
                 Debug.LogWarning($"Window {name} should have default selected item set");
@@ -70,10 +66,6 @@ namespace NEG.UI.UnityUi.Window
 
         public void SetDefaultSelectedItem(GameObject item) => defaultSelectedItem = item;
         
-        public void FireOpenCallback(object data) => OnOpened?.Invoke(data);
-
-        public void FireOnClosed() => OnClosed?.Invoke();
-        
-        public void FireUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed);
+        public void TryUseBack(ref IControllable.BackUsed backUsed) => UseBack?.Invoke(backUsed);
     }
 }
\ No newline at end of file
diff --git a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs
index 023d734..04c49b9 100644
--- a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs
+++ b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlot.cs
@@ -9,11 +9,10 @@ namespace NEG.UI.WindowSlot
         public IWindow CurrentWindow
         {
             get => currentWindow;
-            set
+            protected set
             {
                 currentWindow?.SetClosedState();
                 currentWindow = value;
-                currentWindow?.SetOpenedState(this);
             }
         }
         
@@ -22,7 +21,7 @@ namespace NEG.UI.WindowSlot
         public override void AttachWindow(IWindow window, object data)
         {
             CurrentWindow = window;
-            window.FireOpenCallback(data);
+            window.SetOpenedState(this, data);
         }
 
         public override void DetachWindow(IWindow window) => CurrentWindow = null;
diff --git a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
index 300a09d..a718257 100644
--- a/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
+++ b/NEG/UI/UnityUi/WindowSlot/SingleWindowSlotWithHistory.cs
@@ -21,7 +21,6 @@ namespace NegUtils.NEG.UI.UnityUi.WindowSlot
                 currentWindow?.SetHiddenState();
                 currentWindow = value;
                 windowsHistory.Add(currentWindow);
-                currentWindow?.SetOpenedState(this);
             }
         }
         
@@ -32,7 +31,7 @@ namespace NegUtils.NEG.UI.UnityUi.WindowSlot
         public override void AttachWindow(IWindow window, object data)
         {
             CurrentWindow = window;
-            CurrentWindow.FireOpenCallback(data);
+            CurrentWindow.SetOpenedState(this, data);
         }
 
         public override void DetachWindow(IWindow window)
diff --git a/NEG/UI/Window/IWindow.cs b/NEG/UI/Window/IWindow.cs
index 095bc13..e470343 100644
--- a/NEG/UI/Window/IWindow.cs
+++ b/NEG/UI/Window/IWindow.cs
@@ -12,14 +12,13 @@ namespace NEG.UI.Window
         /// Parent slot of this window.
         /// </summary>
         IWindowSlot Parent { get; }
-        
-        IController Controller { get; }
 
         /// <summary>
         /// Called internally by slot to open window.
         /// </summary>
         /// <param name="parentSlot">slot that opens window</param>
-        void SetOpenedState(IWindowSlot parentSlot);
+        /// <param name="data">data</param>
+        void SetOpenedState(IWindowSlot parentSlot, object data);
 
         /// <summary>
         /// Called internally to close window by slot.

From aafd5dbc754c4cba9d69df2552de6f52b58512aa Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sat, 2 Sep 2023 01:12:42 +0200
Subject: [PATCH 19/20] Apply pr comments

---
 NEG/UI/UnityUi/Buttons/BaseButton.cs                 |  1 -
 NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs | 10 ++--------
 NEG/UI/UnityUi/MonoUiManager.cs                      |  1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/NEG/UI/UnityUi/Buttons/BaseButton.cs b/NEG/UI/UnityUi/Buttons/BaseButton.cs
index 03b8f9d..939bdbf 100644
--- a/NEG/UI/UnityUi/Buttons/BaseButton.cs
+++ b/NEG/UI/UnityUi/Buttons/BaseButton.cs
@@ -32,7 +32,6 @@ namespace NEG.UI.UnityUi.Buttons
         [SerializeField, Child(Flag.Optional)] private Image icon;
 
         [SerializeField] private ButtonSettings groupButtonSettings;
-        //[SerializeField, Self(Flag.Optional)] private ButtonSettingOverride overrideSettings;
 
         private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new Dictionary<string, ButtonElementBehaviour>();
 
diff --git a/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
index aa1b212..4f47a96 100644
--- a/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
+++ b/NEG/UI/UnityUi/Editor/OverridableNavigationDrawer.cs
@@ -68,14 +68,8 @@ namespace NEG.UI.UnityUi.Editor
                     flexGrow = 1
                 }
             };
-            
-            var label = new Label(name)
-            {
-                style =
-                {
-                    //
-                }
-            };
+
+            var label = new Label(name);
 
             var enabler = new Toggle();
             enabler.BindProperty(property.FindPropertyRelative("<Override>k__BackingField"));
diff --git a/NEG/UI/UnityUi/MonoUiManager.cs b/NEG/UI/UnityUi/MonoUiManager.cs
index 06388f5..e5ced8c 100644
--- a/NEG/UI/UnityUi/MonoUiManager.cs
+++ b/NEG/UI/UnityUi/MonoUiManager.cs
@@ -42,7 +42,6 @@ namespace NEG.UI.UnityUi
             
             var popupCanvas = Resources.Load<GameObject>("UI/PopupCanvas");
             var defaultPopup = Resources.Load<GameObject>("UI/DefaultPopupPrefab");
-                //Addressables.LoadAssetsAsync<GameObject>(new List<string>() { "NEG/UI/PopupCanvas", "NEG/UI/DefaultPopupPrefab" }, (_) => { }, Addressables.MergeMode.Union).WaitForCompletion();
       
             Assert.IsNotNull(popupCanvas,"No canvas prefab was provided. Please check MonoUiManager class documentation");
             Assert.IsNotNull(defaultPopup,"No popup prefab was provided. Please check MonoUiManager class documentation");

From 15ea7f7328bb8b775b8bc556c6197acd3486b175 Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Sat, 2 Sep 2023 14:34:01 +0200
Subject: [PATCH 20/20] event rename

---
 NEG/UI/IControllable.cs                      | 2 +-
 NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs | 4 ++--
 NEG/UI/UnityUi/Area/MonoArea.cs              | 4 ++--
 NEG/UI/UnityUi/MonoController.cs             | 4 ++--
 NEG/UI/UnityUi/Window/CloseWindowOnBack.cs   | 4 ++--
 NEG/UI/UnityUi/Window/MonoWindow.cs          | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

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<object> OnOpened; 
         event Action OnClosed;
-        event Action<BackUsed> UseBack;
+        event Action<BackUsed> 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<object> OnOpened;
         public event Action OnClosed;
-        public event Action<IControllable.BackUsed> UseBack;
+        public event Action<IControllable.BackUsed> OnBackUsed;
         
         public IEnumerable<IWindowSlot> 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<object> OnOpened;
         public event Action OnClosed;
-        public event Action<IControllable.BackUsed> UseBack;
+        public event Action<IControllable.BackUsed> OnBackUsed;
         
         public IEnumerable<IWindowSlot> 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