feat(WPF): Add support for visual properties on WPF TextBox, clear button

- Some of the visual properties of TextBox now properly flow to WPF TextBox
- Clear button now works right

Author: MartinZikmund

src/Uno.UI.Runtime.Skia.Wpf/Controls/WpfTextViewTextBox.cs

@@ -0,0 +1,16 @@
+using System.Windows.Controls;
+using WpfFrameworkPropertyMetadata = System.Windows.FrameworkPropertyMetadata;
+
+namespace Uno.UI.Runtime.Skia.WPF.Controls
+{
+	public class WpfTextViewTextBox : TextBox
+	{
+		static WpfTextViewTextBox()
+		{
+			DefaultStyleKeyProperty.OverrideMetadata(typeof(WpfTextViewTextBox),
+				new WpfFrameworkPropertyMetadata(typeof(WpfTextViewTextBox)));
+		}
+
+		public override void OnApplyTemplate() => base.OnApplyTemplate();
+	}
+}

src/Uno.UI.Runtime.Skia.Wpf/WPF/Extensions/CursorExtensions.cs renamed to src/Uno.UI.Runtime.Skia.Wpf/Extensions/CursorExtensions.cs

@@ -7,7 +7,7 @@ internal static class CursorExtensions
 	{
 		public static CoreCursor ToCoreCursor(this Cursor cursor)
 		{
-			CoreCursorType cursorType = CoreCursorType.Arrow;
+			var cursorType = CoreCursorType.Arrow;
 			if (cursor == Cursors.Wait)
 			{
 				cursorType = CoreCursorType.Wait;

src/Uno.UI.Runtime.Skia.Wpf/WPF/Extensions/Helper/Theming/WpfSystemThemeHelperExtension.cs renamed to src/Uno.UI.Runtime.Skia.Wpf/Extensions/Helper/Theming/WpfSystemThemeHelperExtension.cs

@@ -1,10 +1,14 @@
 #nullable enable
 
 using System;
+using System.Windows;
+using System.Windows.Media;
 using Windows.UI.Xaml.Controls;
+using Uno.UI.Runtime.Skia.WPF.Controls;
 using Uno.UI.Skia.Platform;
 using Uno.UI.Xaml.Controls.Extensions;
-using Windows.Foundation;
+using Point = Windows.Foundation.Point;
+using SolidColorBrush = Windows.UI.Xaml.Media.SolidColorBrush;
 using WpfCanvas = System.Windows.Controls.Canvas;
 using WpfTextBox = System.Windows.Controls.TextBox;
 
@@ -14,7 +18,7 @@ internal class TextBoxViewExtension : ITextBoxViewExtension
 	{
 		private readonly TextBoxView _owner;
 		private ContentControl? _contentElement;
-		private WpfTextBox? _currentInputWidget;
+		private WpfTextViewTextBox? _currentInputWidget;
 
 		public TextBoxViewExtension(TextBoxView owner)
 		{
@@ -38,40 +42,28 @@ public void StartEntry()
 			EnsureWidgetForAcceptsReturn();
 			textInputLayer.Children.Add(_currentInputWidget!);
 
-			_contentElement.SizeChanged += _contentElement_SizeChanged;
-			_contentElement.LayoutUpdated += _contentElement_LayoutUpdated;
+			_contentElement.SizeChanged += ContentElementSizeChanged;
+			_contentElement.LayoutUpdated += ContentElementLayoutUpdated;
 			UpdateNativeView();
-			SetInputText(textBox.Text);
+			SetTextNative(textBox.Text);
 
 			UpdateSize();
 			UpdatePosition();
 
 			_currentInputWidget!.Focus();
 		}
 
-		private void _contentElement_LayoutUpdated(object sender, object e)
-		{
-			UpdateSize();
-			UpdatePosition();
-		}
-
-		private void _contentElement_SizeChanged(object sender, Windows.UI.Xaml.SizeChangedEventArgs args)
-		{
-			UpdateSize();
-			UpdatePosition();
-		}
-
 		public void EndEntry()
 		{
 			if (GetInputText() is { } inputText)
 			{
-				_owner.UpdateText(inputText);
+				_owner.UpdateTextFromNative(inputText);
 			}
 
 			if (_contentElement != null)
 			{
-				_contentElement.SizeChanged -= _contentElement_SizeChanged;
-				_contentElement.LayoutUpdated -= _contentElement_LayoutUpdated;
+				_contentElement.SizeChanged -= ContentElementSizeChanged;
+				_contentElement.LayoutUpdated -= ContentElementLayoutUpdated;
 			}
 
 			var textInputLayer = GetWindowTextInputLayer();
@@ -95,26 +87,20 @@ public void UpdateNativeView()
 
 			EnsureWidgetForAcceptsReturn();
 
+			//_currentInputWidget.Margin = new Thickness(
+			//	textBox.ContentElement.Margin.Left,
+			//	textBox.ContentElement.Margin.Top,
+			//	textBox.ContentElement.Margin.Right,
+			//	textBox.ContentElement.Margin.Bottom);
 			_currentInputWidget.FontSize = textBox.FontSize;
-		}
-
-		private void EnsureWidgetForAcceptsReturn()
-		{
-			_currentInputWidget ??= CreateInputControl();
-		}
-
-		private WpfTextBox CreateInputControl()
-		{
-			return new WpfTextBox();
-		}
-
-		private string? GetInputText() => _currentInputWidget?.Text;
-
-		private void SetInputText(string text)
-		{
-			if (_currentInputWidget != null)
+			_currentInputWidget.FontWeight = FontWeight.FromOpenTypeWeight(textBox.FontWeight.Weight);
+			_currentInputWidget.AcceptsReturn = textBox.AcceptsReturn;
+			_currentInputWidget.TextWrapping = textBox.AcceptsReturn ? TextWrapping.Wrap : TextWrapping.NoWrap;
+			_currentInputWidget.MaxLength = textBox.MaxLength;
+			if (textBox.Foreground is SolidColorBrush colorBrush)
 			{
-				_currentInputWidget.Text = text;
+				var unoColor = colorBrush.Color;
+				_currentInputWidget.Foreground = new System.Windows.Media.SolidColorBrush(Color.FromArgb(unoColor.A, unoColor.R, unoColor.G, unoColor.B));
 			}
 		}
 
@@ -149,5 +135,48 @@ public void UpdatePosition()
 				WpfCanvas.SetTop(_currentInputWidget, point.Y);
 			}
 		}
+
+		public void SetTextNative(string text)
+		{
+			if (_currentInputWidget != null)
+			{
+				_currentInputWidget.Text = text;
+			}
+		}
+
+		private void EnsureWidgetForAcceptsReturn()
+		{
+			_currentInputWidget ??= CreateInputControl();
+		}
+
+		private WpfTextViewTextBox CreateInputControl()
+		{
+			var textView = new WpfTextViewTextBox();
+			textView.TextChanged += WpfTextViewTextChanged;
+			return textView;
+		}
+
+		private void WpfTextViewTextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+		{
+			if (_currentInputWidget != null)
+			{
+				_owner.UpdateTextFromNative(_currentInputWidget.Text);
+			}
+		}
+
+		private string? GetInputText() => _currentInputWidget?.Text;
+
+		private void ContentElementLayoutUpdated(object? sender, object e)
+		{
+			UpdateSize();
+			UpdatePosition();
+		}
+
+		private void ContentElementSizeChanged(object sender, Windows.UI.Xaml.SizeChangedEventArgs args)
+		{
+			UpdateSize();
+			UpdatePosition();
+		}
+
 	}
 }

src/Uno.UI.Runtime.Skia.Wpf/WPF/Extensions/Storage/Pickers/FileOpenPickerExtension.cs renamed to src/Uno.UI.Runtime.Skia.Wpf/Extensions/Storage/Pickers/FileOpenPickerExtension.cs

@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:platform="clr-namespace:Uno.UI.Skia.Platform">
+    xmlns:platform="clr-namespace:Uno.UI.Skia.Platform"
+    xmlns:controls="clr-namespace:Uno.UI.Runtime.Skia.WPF.Controls">
 
     <Style TargetType="{x:Type platform:WpfHost}">
         <Setter Property="Template">
@@ -17,6 +18,35 @@
         </Setter>
     </Style>
 
-	<Style x:Key="UnoTextBoxViewOverlayStyle" TargetType="TextBox">
+	<Style TargetType="{x:Type controls:WpfTextViewTextBox}">
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="MinWidth" Value="0" />
+		<Setter Property="MinHeight" Value="0" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:WpfTextViewTextBox}">
+					<Border Name="Border" CornerRadius="0" Margin="{TemplateBinding Margin}" Padding="{TemplateBinding Padding}" BorderThickness="0">
+						<Border.Background>
+							<SolidColorBrush Color="Transparent" />
+						</Border.Background>
+						<Border.BorderBrush>
+							<SolidColorBrush Color="Transparent" />
+						</Border.BorderBrush>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Disabled" />
+								<VisualState x:Name="ReadOnly" />
+								<VisualState x:Name="MouseOver" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<ScrollViewer Margin="0" x:Name="PART_ContentHost" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
 	</Style>
 </ResourceDictionary>

src/Uno.UI.Runtime.Skia.Wpf/WPF/Extensions/Storage/Pickers/FileSavePickerExtension.cs renamed to src/Uno.UI.Runtime.Skia.Wpf/Extensions/Storage/Pickers/FileSavePickerExtension.cs

@@ -81,7 +81,7 @@ void CreateApp(WinUI.ApplicationInitializationCallbackParams _)
 
 			bool EnqueueNative(DispatcherQueuePriority priority, DispatcherQueueHandler callback)
 			{
-				if(priority == DispatcherQueuePriority.Normal)
+				if (priority == DispatcherQueuePriority.Normal)
 				{
 					dispatcher.BeginInvoke(callback);
 				}
@@ -166,7 +166,7 @@ protected override void OnRender(DrawingContext drawingContext)
 				return;
 			}
 
-			
+
 			int width, height;
 			var dpi = VisualTreeHelper.GetDpi(WpfApplication.Current.MainWindow);
 			double dpiScaleX = dpi.DpiScaleX;

src/Uno.UI.Runtime.Skia.Wpf/WPF/Extensions/Storage/Pickers/PickerHelpers.cs renamed to src/Uno.UI.Runtime.Skia.Wpf/Extensions/Storage/Pickers/PickerHelpers.cs

@@ -13,5 +13,7 @@ internal interface ITextBoxViewExtension
 		void UpdateSize();
 
 		void UpdatePosition();
+
+		void SetTextNative(string text);
     }
 }

src/Uno.UI.Runtime.Skia.Wpf/WPF/Extensions/UI/Xaml/Controls/TextBoxViewExtension.cs renamed to src/Uno.UI.Runtime.Skia.Wpf/Extensions/UI/Xaml/Controls/TextBoxViewExtension.cs

@@ -11,7 +11,7 @@ namespace Windows.UI.Xaml.Controls
 {
 	internal class TextBoxView
 	{
-		private ITextBoxViewExtension _textBoxExtension = null;
+		private readonly ITextBoxViewExtension _textBoxExtension;
 
 		private readonly WeakReference<TextBox> _textBox;
 
@@ -43,7 +43,11 @@ public TextBox? TextBox
 
 		public TextBlock DisplayBlock { get; } = new TextBlock();
 
-		internal void SetTextNative(string text) => DisplayBlock.Text = text;
+		internal void SetTextNative(string text)
+		{
+			DisplayBlock.Text = text;
+			_textBoxExtension?.SetTextNative(text);
+		}
 
 		internal void OnForegroundChanged(Brush brush) => DisplayBlock.Foreground = brush;
 
@@ -61,13 +65,13 @@ internal void OnFocusStateChanged(FocusState focusState)
 			}
 		}
 
-		internal void UpdateText(string newText)
+		internal void UpdateTextFromNative(string newText)
 		{
 			var textBox = _textBox?.GetTarget();
 			if (textBox != null)
 			{
 				var text = textBox.ProcessTextInput(newText);
-				SetTextNative(newText);
+				SetTextNative(text);
 			}
 		}