merge conflict

1 files changed, 8 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml.cs
index d774c14eb..bc11dfd18 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/TextInputBoxWindow.xaml.cs
@@ -26,6 +26,14 @@ namespace Tango.MachineStudio.UI.Notifications
         {
             InitializeComponent();
             this.Loaded += TextInputBoxWindow_Loaded;
+
+            ContentRendered += TextInputBoxWindow_ContentRendered;
+        }
+
+        private void TextInputBoxWindow_ContentRendered(object sender, EventArgs e)
+        {
+            txtText.Focus();
+            txtText.SelectAll();
         }
 
         private void TextInputBoxWindow_Loaded(object sender, RoutedEventArgs e)
@@ -34,12 +42,8 @@ namespace Tango.MachineStudio.UI.Notifications
             ani.To = 1;
             ani.Duration = TimeSpan.FromSeconds(0.5);
             this.BeginAnimation(Window.OpacityProperty, ani);
-
-            txtText.Focus();
         }
 
-
-
         public String Hint
         {
             get { return (String)GetValue(HintProperty); }