Merge pull request #137 from slootsjj/recreate-event-object

Recreate event object for ListSelector

Author: rjackey

test/+wt/+test/ListSelector.m

@@ -39,6 +39,11 @@ function setup(testCase)
 
             % Set the initial items
             testCase.verifySetProperty("Items", testCase.ItemNames);
+
+            % Set callback
+            testCase.Widget.ButtonPushedFcn = @(s,e)onCallbackTriggered(testCase,e);
+            testCase.Widget.ValueChangedFcn = @(s,e)onCallbackTriggered(testCase,e);
+            testCase.Widget.HighlightedValueChangedFcn = @(s,e)onCallbackTriggered(testCase,e);
 
         end %function
 
@@ -363,6 +368,29 @@ function testUserButtons(testCase)
             testCase.verifyNumElements(b, 2);
             testCase.press(b(1))
             testCase.press(b(2))
+
+            % Verify callbacks fired
+            testCase.verifyEqual(testCase.CallbackCount, 2);
+            
+        end %function
+
+
+
+        function testAddSource(testCase)
+            
+            % Get the widget
+            w = testCase.Widget;
+            buttonGrid = testCase.Widget.ListButtons;
+            button = buttonGrid.Button;
+
+            % Add User buttons
+            w.AddSource = 'ButtonPushedFcn';
+            
+            % Press the buttons
+            testCase.press(button(1))
+
+            % Verify callbacks fired
+            testCase.verifyEqual(testCase.CallbackCount, 1);
 
         end %function
 

widgets/+wt/ListSelector.m

@@ -411,7 +411,9 @@ function onButtonPushed(obj,evt)
                             obj.promptToAddListItems()
 
                         case wt.enum.ListAddSource.ButtonPushedFcn
-                            notify(obj,"ButtonPushed",evt);
+                            % Trigger event for user buttons
+                            evtOut = wt.eventdata.ButtonPushedData(evt.Button);
+                            notify(obj,"ButtonPushed",evtOut);
 
                     end %switch obj.AddSource
 
@@ -426,7 +428,8 @@ function onButtonPushed(obj,evt)
 
                 otherwise
                     % Trigger event for user buttons
-                    notify(obj,"ButtonPushed",evt);
+                    evtOut = wt.eventdata.ButtonPushedData(evt.Button);
+                    notify(obj,"ButtonPushed",evtOut);
 
             end %switch