Merge pull request #627 from DevFromDownUnder/develop

#373 Focus issues fixes
enisn · Mar 20, 2024 · d0cdeb0 · d0cdeb0
2 parents 77a99dd + 0dc55ce
commit d0cdeb0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 67 deletions.
diff --git a/src/UraniumUI.Material/Controls/InputField.cs b/src/UraniumUI.Material/Controls/InputField.cs
@@ -197,32 +197,21 @@ private void InitializeBorder()
             return;
         }
 
-        border.Content = null;
-        this.Remove(border);
-        border = new Border
+        border.Padding = 0;
+        border.Stroke = BorderColor;
+        border.StrokeThickness = BorderThickness;
+        border.Background = InputBackground;
+        border.BackgroundColor = InputBackgroundColor;
+        border.StrokeDashOffset = 0;
+        border.StrokeShape = new RoundRectangle
         {
-            Padding = 0,
-            Stroke = BorderColor,
-            StrokeThickness = BorderThickness,
-            Background = InputBackground,
-            BackgroundColor = InputBackgroundColor,
-            StrokeDashOffset = 0,
-            StrokeShape = new RoundRectangle
-            {
-                CornerRadius = CornerRadius
-            },
-            Content = rootGrid
+            CornerRadius = CornerRadius
         };
 #endif
 
         border.StrokeDashArray = new DoubleCollection { calculatedFirstDash * 0.9 / BorderThickness, space / BorderThickness, perimeter, 0 };
 
-#if WINDOWS
-        this.Add(border);
-#endif
-
         UpdateState();
-        border.StrokeThickness = BorderThickness;
     }
 
     protected virtual void UpdateState()

diff --git a/src/UraniumUI.Material/Controls/TextField.FocusingWorkaround.cs b/src/UraniumUI.Material/Controls/TextField.FocusingWorkaround.cs