Merge pull request #1961 from cwensley/curtis/wpf-optimizations

Wpf: a few minor optimizations
picoe · Jun 4, 2021 · 73f9df7 · 73f9df7
2 parents 292da8a + e45b912
commit 73f9df7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
@@ -285,6 +285,7 @@ public string Text
 				var oldText = Text;
 				CurrentText = null;
 				var newText = value ?? string.Empty;
+				TextBox.BeginChange();
 				if (newText != oldText)
 				{
 					var args = new TextChangingEventArgs(oldText, newText, false);
@@ -303,6 +304,7 @@ public string Text
 					TextBox.SelectionStart = value.Length;
 					TextBox.SelectionLength = 0;
 				}
+				TextBox.EndChange();
 			}
 		}
 
@@ -345,8 +347,10 @@ public Range<int> Selection
 			set
 			{
 				CurrentSelection = null;
+				TextBox.BeginChange();
 				TextBox.SelectionStart = value.Start;
 				TextBox.SelectionLength = value.Length();
+				TextBox.EndChange();
 				if (!HasFocus)
 					initialSelection = true;
 			}

diff --git a/src/Eto.Wpf/Forms/WpfFrameworkElement.cs b/src/Eto.Wpf/Forms/WpfFrameworkElement.cs
@@ -396,8 +396,11 @@ public virtual bool Visible
 			get { return ContainerControl.Visibility == sw.Visibility.Visible; }
 			set
 			{
-				ContainerControl.Visibility = (value) ? sw.Visibility.Visible : sw.Visibility.Collapsed;
-				UpdatePreferredSize();
+				if (value != Visible)
+				{
+					ContainerControl.Visibility = (value) ? sw.Visibility.Visible : sw.Visibility.Collapsed;
+					UpdatePreferredSize();
+				}
 			}
 		}