merge alarm handling from remote

1 files changed, 10 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs
index 777e53ed0..beb7e0c18 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.cs
@@ -21,6 +21,7 @@ namespace Tango.Touch.Controls
     public class TouchTextBox : TouchInput
     {
         private TextBox _text_box;
+        private PasswordBox _password_box;
         private DateTime _lost_focus_time;
 
         public String Text
@@ -97,6 +98,7 @@ namespace Tango.Touch.Controls
             base.OnApplyTemplate();
 
             _text_box = GetTemplateChild("PART_TextBox") as TextBox;
+            _password_box = GetTemplateChild("PART_PasswordBox") as PasswordBox;
 
             _text_box.GotFocus += _text_box_GotFocus;
             _text_box.LostFocus += _text_box_LostFocus;
@@ -137,7 +139,14 @@ namespace Tango.Touch.Controls
 
         public new void Focus()
         {
-            _text_box.Focus();
+            if (IsPassword)
+            {
+                _password_box.Focus();
+            }
+            else
+            {
+                _text_box.Focus();
+            }
         }
     }
 }