Fix invoking the onFinish callback for UiViews; minor refactor changes

BroWar-Collective · Oct 10, 2023 · 86959cd · 86959cd
1 parent bb774c9
commit 86959cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Assets/Package/Runtime/Tooltip/TooltipTarget.cs b/Assets/Package/Runtime/Tooltip/TooltipTarget.cs
@@ -15,9 +15,6 @@ public abstract class TooltipTarget<T> : MonoBehaviour, IPointerEnterHandler, IP
     {
         [SerializeField, FormerlySerializedAs("settings")]
         private TooltipData data;
-        [SerializeField, Min(0)]
-        [Tooltip("Time needed to show tooltip content.")]
-        private float offsetTime = 0.0f;
         [SerializeField]
         [Tooltip("Optional, custom tooltip prefab. If null, the default one will be used.")]
         private T customPrefab;

diff --git a/Assets/Package/Runtime/Views/UiView.cs b/Assets/Package/Runtime/Views/UiView.cs
@@ -66,7 +66,7 @@ protected virtual void OnDeinitialize()
 
         public override void Show(bool immediately, Action onFinish = null)
         {
-            base.Show(immediately);
+            base.Show(immediately, onFinish);
             foreach (SubViewDefinition viewDefinition in subViews)
             {
                 if (!viewDefinition.performShowHide)
@@ -86,7 +86,7 @@ public override void Show(bool immediately, Action onFinish = null)
 
         public override void Hide(bool immediately, Action onFinish = null)
         {
-            base.Hide(immediately);
+            base.Hide(immediately, onFinish);
             foreach (SubViewDefinition viewDefinition in subViews)
             {
                 if (!viewDefinition.performShowHide)