Command binding now binds through Clickable if possible (for example …

…if VE is button). This brings support for keyboard/controllers navigation clicks
bustedbunny · Feb 21, 2023 · f27c697 · f27c697
1 parent bc0a5cb
commit f27c697
Showing 1 changed file with 20 additions and 3 deletions.
diff --git a/Runtime/Binding/CommandBinding.cs b/Runtime/Binding/CommandBinding.cs
@@ -46,12 +46,21 @@ public CommandBinding(VisualElement element, object boundObject, string key)
             }
 
 
-            element.RegisterCallback<ClickEvent>(OnClick);
+            if (element is Button button)
+            {
+                button.clicked += OnClick;
+            }
+            else
+            {
+                element.RegisterCallback<ClickEvent>(OnClick);
+            }
+
             Command.CanExecuteChanged += SetCanExecute;
 
             SetCanExecute(null, null);
         }
 
+
         private static object ParseArgument(string key)
         {
             if (bool.TryParse(key, out var boolResult)) return boolResult;
@@ -60,7 +69,8 @@ private static object ParseArgument(string key)
             return key;
         }
 
-        private void OnClick(ClickEvent evt) => Command.Execute(_argument);
+        private void OnClick() => Command.Execute(_argument);
+        private void OnClick(ClickEvent evt) => OnClick();
 
         private void SetCanExecute(object sender, EventArgs eventArgs)
         {
@@ -71,7 +81,14 @@ private void SetCanExecute(object sender, EventArgs eventArgs)
         public void Unbind()
         {
             Command.CanExecuteChanged -= SetCanExecute;
-            Element.UnregisterCallback<ClickEvent>(OnClick);
+            if (Element is Button button)
+            {
+                button.clicked -= OnClick;
+            }
+            else
+            {
+                Element.UnregisterCallback<ClickEvent>(OnClick);
+            }
         }
     }
 }