Merge pull request #9 from NoTaskStudios/fix-pointer-filter

fix: pointer filter

Author: Leniton

Assets/Package/Runtime/Core/CustomButtonBase.cs

@@ -14,7 +14,6 @@ public abstract class CustomButtonBase : MonoBehaviour, ICustomButton
         public RectTransform rectTransform;
 
         [SerializeField] private bool _interactable = true;
-        [SerializeField] private PointerFilter _pointerFilter = PointerFilter.LeftClick | PointerFilter.Tap;
 
         public bool Interactable
         {
@@ -28,16 +27,6 @@ public bool Interactable
             }
         }
 
-        public PointerFilter PointerFilter
-        {
-            get => _pointerFilter;
-            set
-            {
-                _pointerFilter = value;
-                UpdatePointerFilter();
-            }
-        }
-
         public Graphic targetGraphic 
         { 
             get => Transition.targetGraphic;
@@ -94,7 +83,6 @@ private void Awake()
         private void OnEnable()
         {
             onClick.AddListener(OnClick);
-            UpdatePointerFilter();
         }
 
         private void OnDisable()
@@ -111,33 +99,8 @@ private void Reset()
             Transition = new() { targetGraphic = GetComponent<Graphic>() };
         }
 
-        private void OnValidate()
-        {
-            UpdatePointerFilter();
-        }
-
         #endregion
 
-        private void UpdatePointerFilter()
-        {
-            if(!Application.isPlaying) return;
-            filter = new();
-            int value = (int)_pointerFilter;
-            int comparingValue = 1;
-            for (int i = 0; i < 32; i++)
-            {
-                if ((comparingValue & value) != 0)
-                    filter.Add(i - 3);
-
-                comparingValue <<= 1;
-            }
-
-            for (int i = 0; i < filter.Count; i++)
-            {
-                Debug.Log(filter[i]);
-            }
-        }
-
         public void ToogleInteractable() => Interactable = !Interactable;
 
         public virtual void OnClick()
@@ -163,7 +126,7 @@ public void OnSubmit(BaseEventData eventData)
         //Goes after PointerUp
         public void OnPointerClick(PointerEventData eventData)
         {
-            if (!_interactable || !filter.Contains(eventData.pointerId)) return;
+            if (!_interactable || eventData.button != PointerEventData.InputButton.Left) return;
             selectionState = SelectionState.Selected;
             isSelected = true;
             EventSystem.current.SetSelectedGameObject(gameObject);
@@ -172,14 +135,13 @@ public void OnPointerClick(PointerEventData eventData)
 
         public void OnPointerDown(PointerEventData eventData)
         {
-            if (!_interactable || !filter.Contains(eventData.pointerId)) return;
+            if (!_interactable || eventData.button != PointerEventData.InputButton.Left) return;
             selectionState = SelectionState.Pressed;
         }
 
-        //Goes before PointerUp
         public void OnPointerUp(PointerEventData eventData)
         {
-            if (!_interactable || !filter.Contains(eventData.pointerId)) return;
+            if (!_interactable || eventData.button != PointerEventData.InputButton.Left) return;
             pointerUpBuffer = StartCoroutine(PointerUpBuffer());
         }