fixes #192 ButtonGrid update errors if there are zero buttons

Author: rjackey

test/+wt/+test/ButtonGrid.m

@@ -35,6 +35,9 @@ function testCreationByIcon(testCase)
             icon = ["add" "delete" "play" "pause" "stop"] + "_24.png";
 
             testCase.verifySetProperty("Icon", icon);
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -50,6 +53,23 @@ function testCreationByTextAndIcon(testCase)
 
             expNum = max(numel(text), numel(icon));
             testCase.verifyNumElements(testCase.Widget.Button, expNum)
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
+            
+        end %function
+        
+        
+        function testEmptyButtons(testCase)
+            % Add buttons by Icon and Text
+            
+            testCase.verifySetProperty("Icon", strings(1,0));
+            testCase.verifySetProperty("Text", strings(1,0));
+            
+            testCase.verifyEmpty(testCase.Widget.Button)
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -65,6 +85,9 @@ function testMissingIcons(testCase)
 
             expNum = max(numel(text), numel(icon));
             testCase.verifyNumElements(testCase.Widget.Button, expNum)
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -80,6 +103,9 @@ function testMissingText(testCase)
 
             expNum = max(numel(text), numel(icon));
             testCase.verifyNumElements(testCase.Widget.Button, expNum)
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -97,6 +123,9 @@ function testExtraTooltip(testCase)
 
             expNum = max(numel(text), numel(icon));
             testCase.verifyNumElements(testCase.Widget.Button, expNum)
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -127,6 +156,9 @@ function testPressButton(testCase)
             testCase.verifyEqual([evts.Button], buttons)
             testCase.verifyEqual(string({evts.Text}), text)
             testCase.verifyEqual(string({evts.Tag}), tag)
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -137,6 +169,9 @@ function testBackgroundColor(testCase)
             newValue = [1 0.5 0.2];
             testCase.verifySetProperty("BackgroundColor", newValue);
             testCase.verifyEqual(testCase.Widget.Grid.BackgroundColor, newValue);
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -156,6 +191,9 @@ function testOrientation(testCase)
             testCase.verifySetProperty("Orientation", "vertical");
             testCase.verifyNumElements(testCase.Widget.Grid.RowHeight, numel(icon));
             testCase.verifyNumElements(testCase.Widget.Grid.ColumnWidth, 1);
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -188,6 +226,9 @@ function testIconAlignment(testCase)
             newValue = "left";
             testCase.verifySetProperty("IconAlignment", newValue);
             testCase.verifyMatches(button.IconAlignment, newValue);
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end %function
 
@@ -212,6 +253,9 @@ function testButtonWidthHeight(testCase)
             testCase.verifySetProperty("Text", ["1", "2", "3", "4"], ["1", "2", "3", "4"])
             testCase.verifyEqual(testCase.Widget.ButtonWidth, {10 20 30 30})
 
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
+
             % Change to vertical layout
             newOrientation = "vertical";
             testCase.verifySetProperty("Orientation", newOrientation);
@@ -226,6 +270,9 @@ function testButtonWidthHeight(testCase)
 
             testCase.verifySetProperty("ButtonWidth", {10 'fit'}, {10})
             testCase.verifySetProperty("ButtonWidth", 20, {20})
+
+            diag = "Expected update to run without warnings.";
+            testCase.verifyWarningFree(@()testCase.Widget.forceUpdate(), diag)
 
         end
 

widgets/+wt/ButtonGrid.m

@@ -181,10 +181,10 @@ function update(obj)
             end
 
             % Remove any extra rows/cols from the grid
-            if obj.Orientation == "vertical"
+            if obj.Orientation == "vertical" && numNew > 0
                 obj.Grid.RowHeight(numNew+1:end) = [];
                 obj.Grid.ColumnWidth = obj.Grid.ColumnWidth(1);
-            else
+            elseif obj.Orientation == "horizontal" && numNew > 0
                 obj.Grid.ColumnWidth(numNew+1:end) = [];
                 obj.Grid.RowHeight = obj.Grid.RowHeight(1);
             end