Changed ProgressBar and PasswordFields to COmponentcontainer Inheritance

Author: msulliva72

widgets/+wt/+mixin/BackgroundColorable.m

@@ -6,18 +6,19 @@
 
 
     %% Properties
-    properties (AbortSet, Abstract)
+    properties (AbortSet, Abstract, ...
+            Access = {?matlab.ui.componentcontainer.ComponentContainer})
+
+        %BackgroundColor (1,3) double {wt.validators.mustBeBetweenZeroAndOne}
 
-        % Background Color
-        BackgroundColor (1,3) double {wt.validators.mustBeBetweenZeroAndOne}
 
     end %properties
 
 
 
     %% Internal properties
     properties (AbortSet, Transient, NonCopyable, ...
-            Access = {?wt.abstract.BaseWidget, ?wt.test.BaseWidgetTest} )
+            Access = {?matlab.ui.componentcontainer.ComponentContainer})
 
         % List of graphics controls to apply to
         BackgroundColorableComponents (:,1) matlab.graphics.Graphics
@@ -47,12 +48,26 @@
     methods (Access = protected)
 
         function updateBackgroundColorableComponents(obj)
+           
 
             hasProp = isprop(obj.BackgroundColorableComponents,'BackgroundColor');
             wt.utility.fastSet(obj.BackgroundColorableComponents(hasProp),...
                 "BackgroundColor",obj.BackgroundColor);
 
         end %function
+
+
+        function listenForBackgroundChange(obj)
+
+            % Establish Listener for Background Color Change
+            addlistener(obj,'BackgroundColor','PostSet',...
+                @(h,e)obj.updateBackgroundColorableComponents());
+
+        end
+
+        
+
+        
 
     end %methods
 

widgets/+wt/+mixin/FontStyled.m

@@ -28,7 +28,7 @@
 
     %% Internal properties
     properties (AbortSet, Transient, NonCopyable, ...
-            Access = {?wt.abstract.BaseWidget, ?wt.test.BaseWidgetTest} )
+            Access = {?wt.abstract.BaseWidget, ?wt.test.BaseWidgetTest, ?matlab.ui.componentcontainer.ComponentContainer} )
 
         % List of graphics controls to apply to
         FontStyledComponents (:,1) matlab.graphics.Graphics

widgets/+wt/+mixin/GridOrganized.m

@@ -6,24 +6,25 @@
     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
+        Grid (1,1) matlab.ui.container.GridLayout
 
     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
+       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
+       
     end
 end

widgets/+wt/PasswordField.m

@@ -1,5 +1,5 @@
 classdef PasswordField <  matlab.ui.componentcontainer.ComponentContainer & ...
-    wt.mixin.ErrorHandling & wt.mixin.GridOrganized
+    wt.mixin.ErrorHandling & wt.mixin.GridOrganized & wt.mixin.BackgroundColorable
 
     % A password entry field
 
@@ -12,6 +12,7 @@
         % The current value shown
         Value (1,1) string
 
+                
     end %properties
 
 
@@ -26,22 +27,25 @@
 
 
     %% Internal Properties
-    properties ( Transient, NonCopyable)
+    properties (Transient, NonCopyable)
 
         % Password control
         PasswordControl (1,1) matlab.ui.control.HTML
 
     end %properties
 
 
-    
     %% Protected methods
     methods (Access = protected)
 
         function setup(obj)
 
-            % Establish Grid for Control
+            % Establish Grid for Control         
             obj.establishGrid();
+
+            % Establish Background Color Listener
+            obj.BackgroundColorableComponents = obj.Grid;
+            obj.listenForBackgroundChange();
 
             % Set default size
             obj.Position(3:4) = [100 25];
@@ -64,20 +68,12 @@ function setup(obj)
                 'Parent',obj.Grid,...
                 'HTMLSource',html,...
                 '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
 
-        end
+ 
 
 
         function update(obj)
@@ -87,6 +83,16 @@ function update(obj)
 
         end %function
 
+%         function updateBackgroundColorableComponents(obj)
+%             % Override Default BGC Update with Additional Components
+%             obj.Grid.BackgroundColor = obj.BackgroundColor;
+%             hasProp = isprop(obj.BackgroundColorableComponents,'BackgroundColor');
+%             set(obj.BackgroundColorableComponents(hasProp),...
+%                 "BackgroundColor",obj.BackgroundColor);
+% 
+%         end
+
+
     end %methods
 
 

widgets/+wt/ProgressBar.m

@@ -1,4 +1,6 @@
-classdef ProgressBar < wt.abstract.BaseWidget & wt.mixin.FontStyled
+classdef ProgressBar < matlab.ui.componentcontainer.ComponentContainer & ...
+    wt.mixin.ErrorHandling & wt.mixin.GridOrganized & wt.mixin.FontStyled 
+    
     % A progress bar with status and cancel button
 
     % Copyright 2020-2021 The MathWorks Inc.
@@ -69,7 +71,7 @@
 
     %% Internal Properties
     properties ( Transient, NonCopyable, ...
-            Access = {?wt.abstract.BaseWidget, ?wt.test.BaseWidgetTest} )
+            Access = {?matlab.ui.componentcontainer.ComponentContainer} )
 
         % Progress panel
         ProgressPanel (1,1) matlab.ui.container.Panel
@@ -224,7 +226,7 @@ function demo(obj)
         function setup(obj)
 
             % Call superclass setup to establish the main grid
-            obj.setup@wt.abstract.BaseWidget();
+            obj.establishGrid();
 
             % Set default size
             obj.Position(3:4) = [200 30];

widgets/resources/appDesigner.json

@@ -122,13 +122,13 @@
     {
       "className": "wt.PasswordField",
       "componentName": "Password Field",
-      "description": "A password entry field where the text is hidden as dots.",
+      "description": "A password entry field where the text is hidden as dots. Derives from ui.componentcontainer.ComponentContainer",
       "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAB3RJTUUH5AwREjotE4Db3QAAAapJREFUSIntlE1IFGEYgJ9vdn5k8bSeFnYhMIggCHElJSVoiQhkO9ScZIOgk3jQhCXpRxQPIjsEXaOjBXuJokuBnQoXWgkykmovwjoHl/RgSbPTzNsh8ahGfnTxOb6H5+H7XnjhiP+NymazxSAItMgdx0GVSiXJ5XJaArVaDTOdTuO6rpaA7/sYURRpkQNEUYShzb7DbiDwa4y6AwzNPOHHzuxXc5mJoXNcvf2IzfjPLN78wtT1PIXxB6yHByiUvfsiEsrD8Utigai2lMy+qotIJI/vXRFbIdjtcvfpsoiIPJsrimMgWEkZm6/KXnieJ4YyDAi/8a76khCQnxssVOvABkuLL2gJ0PrOwuJnYJv3b58TxEC4zes3K7QO+kW6MCSOweqgp/ciFqDaUuR7jwMpuvsGsRVgt5PvOwEk6TpbwDEAK8n5/pPY+wRMJAJMijen+bi6RfP0MCMXOgFwRyb5UG/y9dg1xgqnABi8cYeJT2sspS5zyz2z/xPK5fKei/oXPM8T/TswTVObPJFIYDYaDSqVipaA7/uoTCaj5VwrpXAc59C9R/w9vwGf2g17roftigAAAABJRU5ErkJggg==",
       "category": "Widgets Toolbox",
       "authorName": "Robyn Jackey - MathWorks Consulting",
       "authorEmail": "",
-      "version": "2.1",
-      "avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAZCAIAAABIPBwcAAAAB3RJTUUH5AwREjoxB4GHkgAAAG9JREFUWIXt0DEOgCAABMHDyAP4Cf//GgUWJvZbGNDsNNdeNpHeUO4ZY6z9sblaa55Yc86lZ3ZXSklyrL7xJcYCjAUYCzAWYCzAWICxAGMBxgKMBRgLMBZgLMBYgLEAYwHGAowFnElaa7331U/0Lxe5Kwbwb3BHfQAAAABJRU5ErkJggg==",
+      "version": "3.0",
+      "avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAZCAIAAABIPBwcAAAAB3RJTUUH5QwOEwsZNo3WgQAAAJRJREFUWIXt2bEJwzAURVE7eJr3Kk2nibSWZtAIKRwSQ4r4VVLgnsYCN5/Lx4W8jzE23POYPcA/Oc5HKWXuHCuT1Frb2KyfJNk+z8f1Re99xjxLq7W+z2xWgFgBYgWIFSBWgFgBYgWIFSBWgFgBYgWIFSBWgFgBYgWIFfhc/tm+XnTh22uzbEuaO8r6dn6F3cc3K/AE7UoQuvgib+gAAAAASUVORK5CYII=",
       "defaultPosition": [
         1,
         1,
@@ -139,13 +139,13 @@
     {
       "className": "wt.ProgressBar",
       "componentName": "Progress Bar",
-      "description": "A progress bar that can optionally display time remaining, status message, and cancel button. It can also be made indeterminate to show \"busy\" status.",
+      "description": "A progress bar that can optionally display time remaining, status message, and cancel button. It can also be made indeterminate to show \"busy\" status. Inherits from UI Component Container + Mixins.",
       "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAB3RJTUUH5AwREiAHeBbo0AAAAN1JREFUSIntlLFKxEAURc8bJ9ktoojICmu5aUTETmwE/8zOPxDsV/YPAv6M5BM2MbsKknnPYgUJVhMJIuTANLe4Z5p3YeSvESAbWhAGFUynB3Z4dI2RABZdEIJxcZ5xOp908qqqKIoCmZ2c2eXVE2r7gEYL3t6V+7sFtzdpJy/LkjzP8WZK225Qk16C0Crb7Stw3MmbpgHARTdGMgpGwT8Q+N0c7X096VHhSJLJjzRNd5ftTdfoxzOqGfGX7Ehsw+PDC6vl91SICHVd471HRCid6/t7ACOEQQd55Jd8AujXQbk6YnXJAAAAAElFTkSuQmCC",
       "category": "Widgets Toolbox",
       "authorName": "Robyn Jackey - MathWorks Consulting",
       "authorEmail": "",
-      "version": "2.1",
-      "avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAAeCAIAAADmXcb7AAAAB3RJTUUH5AwREiALcaCk+wAAAGxJREFUeJzt0kENACEQwMDj/ItdCZigISEzCvrompkPTvtvB/AmY5EwFgljkTAWCWORMBYJY5EwFgljkTAWCWORMBYJY5EwFgljkTAWCWORMBYJY5EwFgljkTAWCWORMBYJY5EwFgljkTAWiQ2jJAMMhsTjyAAAAABJRU5ErkJggg==",
+      "version": "3.0",
+      "avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAAeCAIAAADmXcb7AAAAB3RJTUUH5QwOExwLwLcjXwAAAGxJREFUeJzt0kENACEQwMDj/ItdCZigISEzCvrompkPTvtvB/AmY5EwFgljkTAWCWORMBYJY5EwFgljkTAWCWORMBYJY5EwFgljkTAWCWORMBYJY5EwFgljkTAWCWORMBYJY5EwFgljkTAWiQ2jJAMMhsTjyAAAAABJRU5ErkJggg==",
       "defaultPosition": [
         1,
         1,
@@ -222,6 +222,6 @@
       ]
     }
   ],
-  "schema": 1,
+  "schema": 2,
   "MATLABRelease": "R2021b"
 }