work on dialogs

Author: rjackey

widgets/+wt/+abstract/BaseDialog2.m

@@ -75,6 +75,72 @@
     end %methods
 
 
+    %% Lower Button Properties
+    % The dialog subclass can change these values
+    properties (Dependent)
+
+        LowerButtonText
+
+        LowerButtonTag
+
+        LowerButtonTooltip
+
+        LowerButtonEnable
+
+        LowerButtonWidth
+
+        LowerButtonHeight
+
+    end %methods
+
+    % Accessors
+    methods
+
+        function value = get.LowerButtonText(obj)
+            value = obj.LowerButtons.Text;
+        end
+        function set.LowerButtonText(obj,value)
+            obj.LowerButtons.Text = value;
+        end
+
+        function value = get.LowerButtonTag(obj)
+            value = obj.LowerButtons.ButtonTag;
+        end
+        function set.LowerButtonTag(obj,value)
+            obj.LowerButtons.ButtonTag = value;
+        end
+
+        function value = get.LowerButtonTooltip(obj)
+            value = obj.LowerButtons.Tooltip;
+        end
+        function set.LowerButtonTooltip(obj,value)
+            obj.LowerButtons.Tooltip = value;
+        end
+
+        function value = get.LowerButtonEnable(obj)
+            value = obj.LowerButtons.ButtonEnable;
+        end
+        function set.LowerButtonEnable(obj,value)
+            obj.LowerButtons.ButtonEnable = value;
+        end
+
+        function value = get.LowerButtonWidth(obj)
+            value = obj.LowerButtons.ButtonWidth;
+        end
+        function set.LowerButtonWidth(obj,value)
+            obj.LowerButtons.ButtonWidth = value;
+        end
+
+        function value = get.LowerButtonHeight(obj)
+            value = obj.LowerButtons.ButtonHeight;
+        end
+        function set.LowerButtonHeight(obj,value)
+            obj.LowerButtons.ButtonHeight = value;
+        end
+
+    end %methods
+
+
     %% Internal Properties
     properties (Transient, NonCopyable, Hidden, SetAccess = private)
 
@@ -105,6 +171,9 @@
         % Modal image (optional)
         ModalImage matlab.ui.control.Image
 
+        % Lower buttons (optional)
+        LowerButtons wt.ButtonGrid
+
     end %properties
 
 
@@ -199,17 +268,6 @@ function positionOver(obj, refComp)
 
         end %function
 
-
-        function b = addButtons(obj, labels)
-            % Adds buttons to the lower dialog area
-
-            b = wt.ButtonGrid(obj.InnerGrid,"Text",labels,"Icon",[]);
-            b.ButtonWidth(:) = {'fit'};
-            b.Layout.Row = 2;
-            b.Layout.Column = 2;
-
-        end %function
-
     end %methods
 
 
@@ -239,6 +297,7 @@ function setup(obj)
             % Close Button
             obj.CloseButton = uibutton(obj.OuterPanel);
             obj.CloseButton.Text = "";
+            obj.CloseButton.Tag = "close";
             obj.CloseButton.IconAlignment = "center";
             obj.CloseButton.ButtonPushedFcn = @(src,evt)obj.onClosePushed();
 
@@ -286,6 +345,12 @@ function setup(obj)
             szF = posF(3:4);
             obj.ModalImage.Position = [1 1 szF];
 
+            % Add lower buttons
+            obj.LowerButtons = wt.ButtonGrid(obj.InnerGrid,"Text",[],"Icon",[]);
+            obj.LowerButtons.Layout.Row = 2;
+            obj.LowerButtons.Layout.Column = 2;
+            obj.LowerButtons.DefaultSize = 'fit';
+
             % Bring the dialog back to the top
             uistack(obj,"top");
 
@@ -307,6 +372,19 @@ function update(obj)
             obj.repositionCloseButton();
 
         end %function
+        
+
+        function updateBackgroundColorableComponents(obj)
+            % Update components that are affected by BackgroundColor
+            % (overrides the superclass method)
+            
+            % Update grid color
+            set([obj.InnerGrid, obj.Grid], "BackgroundColor", obj.BackgroundColor);
+
+            % Call superclass method
+            obj.updateBackgroundColorableComponents@wt.mixin.BackgroundColorable();
+            
+        end %function
 
 
         function onClosePushed(obj)

widgets/+wt/+dialog/Login.m

@@ -12,9 +12,9 @@
     end %properties
 
 
- %% Protected methods
+    %% Protected methods
     methods (Access = protected)
-        
+
         function setup(obj)
             % Configure the widget
 
@@ -25,7 +25,8 @@ function setup(obj)
             obj.setup@wt.abstract.BaseDialog2();
 
             % Add buttons
-            b = addButtons(obj, ["Login","Cancel"]);
+            obj.LowerButtonText = ["Login","Cancel"];
+            obj.LowerButtonTag = ["login","cancel"];
 
             % Configure grid
             obj.Grid.RowHeight = {25,25};
@@ -37,7 +38,7 @@ function setup(obj)
             % Add labels
             col = 1;
             startRow = 1;
-            lbl = obj.addRowLabels(["Username:","Password"], ...
+            obj.addRowLabels(["Username:","Password"], ...
                 obj.Grid, col, startRow);
 
             % Add controls
@@ -48,7 +49,10 @@ function setup(obj)
             obj.PasswordField = wt.PasswordField(obj.Grid);
             obj.PasswordField.Layout.Row = 2;
             obj.PasswordField.Layout.Column = 2;
-            
+
+            % Update component lists
+            % obj.BackgroundColorableComponents = [obj.Grid]
+
         end %function
 
     end %methods

widgets/+wt/ButtonGrid.m

@@ -42,6 +42,9 @@
         % Alignment of the icon
         IconAlignment (1,1) wt.enum.AlignmentState = wt.enum.AlignmentState.top
 
+        % Default size of new buttons ('1x' or 'fit')
+        DefaultSize {mustBeMember(DefaultSize,{'1x','fit'})} = '1x'
+
     end %properties
 
 
@@ -149,9 +152,11 @@ function update(obj)
                 if obj.Orientation == "vertical"
                     obj.Button(idx).Layout.Column = 1;
                     obj.Button(idx).Layout.Row = idx;
+                    obj.Grid.ColumnWidth{idx} = obj.DefaultSize;
                 else
                     obj.Button(idx).Layout.Column = idx;
                     obj.Button(idx).Layout.Row = 1;
+                    obj.Grid.ColumnWidth{idx} = obj.DefaultSize;
                 end %if obj.Orientation == "vertical"
 
             end %for idx = 1:numNew