Working on Migrating Widgets Base Class to Separate Mixables

- Modifying PasswordField

Author: msulliva72

widgets/+wt/+mixin/GridOrganized.m

@@ -0,0 +1,29 @@
+classdef GridOrganized < handle
+    % Mixin for component to be organized within a 1x1 UIGridLayout
+    %
+
+    %% Properties
+    properties (AbortSet, Transient, NonCopyable)
+        
+        % GridLayout
+        Grid (1,1) matlab.ui.container.GridLayout = uigridlayout;
+
+        % List of graphics controls that BackgroundColor should apply to
+        BackgroundColorableComponents (:,1) matlab.graphics.Graphics
+
+    end
+
+
+    %% Accessors
+    methods (Access = protected)
+
+        function updateBackgroundColorableComponents(obj)
+            % Update components that are affected by BackgroundColor
+            
+            hasProp = isprop(obj.BackgroundColorableComponents,'BackgroundColor');
+            set(obj.BackgroundColorableComponents(hasProp),...
+                "BackgroundColor",obj.BackgroundColor);
+            
+        end %function
+    end
+end

widgets/+wt/ButtonGrid.m

@@ -1,4 +1,4 @@
-classdef ButtonGrid < wt.abstract.BaseWidget &...
+classdef ButtonGrid < matlab.ui.componentcontainer.ComponentContainer &...
         wt.mixin.Enableable & wt.mixin.FontStyled & wt.mixin.ButtonColorable
     % A grid of buttons with a single callback/event
 

widgets/+wt/PasswordField.m

@@ -1,4 +1,6 @@
-classdef PasswordField < wt.abstract.BaseWidget
+classdef PasswordField <  matlab.ui.componentcontainer.ComponentContainer & ...
+    wt.mixin.ErrorHandling & wt.mixin.GridOrganized
+    
     % A password entry field
 
     % Copyright 2020-2021 The MathWorks Inc.
@@ -24,8 +26,7 @@
 
 
     %% Internal Properties
-    properties ( Transient, NonCopyable, ...
-            Access = {?wt.abstract.BaseWidget, ?wt.test.BaseWidgetTest} )
+    properties ( Transient, NonCopyable)
 
         % Password control
         PasswordControl (1,1) matlab.ui.control.HTML
@@ -39,8 +40,8 @@
 
         function setup(obj)
 
-            % Call superclass setup first to establish the grid
-            obj.setup@wt.abstract.BaseWidget();
+            % Establish Grid for Control
+            obj.establishGrid();
 
             % Set default size
             obj.Position(3:4) = [100 25];
@@ -65,6 +66,18 @@ function setup(obj)
                 'DataChangedFcn',@(h,e)obj.onPasswordChanged(e) );
 
         end %function
+
+        function establishGrid(obj)
+
+            % Construct Grid Layout to Manage Building Blocks
+            obj.Grid = uigridlayout(obj);
+            obj.Grid.ColumnWidth = {'1x'};
+            obj.Grid.RowHeight = {'1x'};
+            obj.Grid.RowSpacing = 2;
+            obj.Grid.ColumnSpacing = 2;
+            obj.Grid.Padding = [2];            
+
+        end
 
 
         function update(obj)