fix: GTK TextBox selection

unoplatform · Mar 7, 2023 · 5efdac4 · 5efdac4
1 parent ebf5d8e
commit 5efdac4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/UI/Xaml/Controls/SinglelineTextBoxView.cs b/src/Uno.UI.Runtime.Skia.Gtk/UI/Xaml/Controls/SinglelineTextBoxView.cs
@@ -1,6 +1,7 @@
 #nullable enable
 
 using System;
+using System.Reflection.Metadata.Ecma335;
 using Gtk;
 using Uno.Disposables;
 using Windows.UI.Xaml.Controls;
@@ -29,8 +30,11 @@ public override string Text
 
 	public override bool IsCompatible(TextBox textBox) => !textBox.AcceptsReturn || textBox is PasswordBox;
 
-	public override (int start, int end) GetSelectionBounds() => _entry.GetSelectionBounds(out var start, out var end) ?
-		(start, end) : (0, 0);
+	public override (int start, int end) GetSelectionBounds()
+	{
+		_entry.GetSelectionBounds(out var start, out var end);
+		return (start, end);
+	}
 
 	public override void SetSelectionBounds(int start, int end) => _entry.SelectRegion(start_pos: start, end_pos: end);
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/OverlayTextBoxView/OverlayTextBoxViewExtension.skia.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/OverlayTextBoxView/OverlayTextBoxViewExtension.skia.cs
@@ -51,9 +51,9 @@ public void StartEntry()
 		_lastPosition = new Point(-1, -1);
 		UpdateNativeView();
 		SetNativeText(textBox.Text);
-		InvalidateLayout();
 
-		_textBoxView!.AddToTextInputLayer(xamlRoot);		
+		_textBoxView!.AddToTextInputLayer(xamlRoot);	
+		InvalidateLayout();
 		_textBoxView.SetFocus(true);
 
 		// Selection is now handled by native control

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.skia.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.skia.cs
@@ -77,13 +77,13 @@ internal void Select(int start, int length)
 
 		internal void OnForegroundChanged(Brush brush)
 		{
-			InnerText.Foreground = brush;
+			DisplayBlock.Foreground = brush;
 			_textBoxExtension?.UpdateProperties();
 		}
 
 		internal void OnSelectionHighlightColorChanged(SolidColorBrush brush)
 		{
-			InnerText.SelectionHighlightColor = brush;
+			DisplayBlock.SelectionHighlightColor = brush;
 			_textBoxExtension?.UpdateProperties();
 		}