From aafd5dbc754c4cba9d69df2552de6f52b58512aa Mon Sep 17 00:00:00 2001 From: Hubert Mattusch Date: Sat, 2 Sep 2023 01:12:42 +0200 Subject: [PATCH] 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 behaviours = new Dictionary(); 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("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("UI/PopupCanvas"); var defaultPopup = Resources.Load("UI/DefaultPopupPrefab"); - //Addressables.LoadAssetsAsync(new List() { "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");