Fix unit test error.

BDisp · Aug 26, 2023 · ff1f6f8 · ff1f6f8
1 parent 5bfe384
commit ff1f6f8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Design.cs b/src/Design.cs
@@ -155,9 +155,17 @@ public Design CreateSubControlDesign(string name, View subView)
         // HACK: if you don't pull the label out first it complains that you cant set Focusable to true
         // on the Label because its super is not focusable :(
         var super = subView.SuperView;
-        if (super != null)
+        var borderBrush = subView.Border != null ? subView.Border.BorderBrush : (Color)(-1);
+        var background = subView.Border != null ? subView.Border.Background : (Color)(-1);
+        if (super != null && super.Subviews.FirstOrDefault(sv => sv == subView && sv.Data == subView.Data) != null)
         {
+            this.logger.Info($"Found and removing subView of Type '{subView.GetType()}' in the superView'{super}'");
             super.Remove(subView);
+            if (subView.Border != null)
+            {
+                subView.Border.BorderBrush = (Color)borderBrush!;
+                subView.Border.Background = (Color)background!;
+            }
         }
 
         // all views can be focused so that they can be edited