Merge pull request #746 from mminns/issue-742

J Wyman · web-flow · commit 7c7eab48bede · 2018-09-06T09:37:27.000-04:00
issue-742 Grab keyboard focus when the Bitbucket dialog opens.
diff --git a/Bitbucket.Authentication/Src/Controls/CredentialsControl.xaml.cs b/Bitbucket.Authentication/Src/Controls/CredentialsControl.xaml.cs
@@ -24,6 +24,7 @@
 **/
 
 using System;
+using System.Windows.Input;
 using GitHub.Shared.Controls;
 using GitHub.Shared.Helpers;
 
@@ -44,10 +45,12 @@ protected override void SetFocus()
             if (string.IsNullOrWhiteSpace(loginTextBox.Text))
             {
                 loginTextBox.TryFocus().Wait(TimeSpan.FromSeconds(1));
+                Keyboard.Focus(loginTextBox);
             }
             else
             {
                 passwordTextBox.TryFocus().Wait(TimeSpan.FromSeconds(1));
+                Keyboard.Focus(passwordTextBox);
             }
         }
     }
diff --git a/Bitbucket.Authentication/Src/Views/CredentialsWindow.xaml b/Bitbucket.Authentication/Src/Views/CredentialsWindow.xaml
@@ -42,6 +42,7 @@
     MinHeight="380"
     Height="420"
     Width="420"
+    Topmost="True"
     Icon="pack://application:,,,/Bitbucket.Authentication;component/Assets/ADG3/Images/Bitbucket-16x16.ico">
     <Window.DataContext>
         <viewmodels:CredentialsViewModel />
diff --git a/Bitbucket.Authentication/Src/Views/OAuthWindow.xaml b/Bitbucket.Authentication/Src/Views/OAuthWindow.xaml
@@ -41,6 +41,7 @@
     Title="Bitbucket OAuth Authentication"
     Height="420"
     Width="420"
+    Topmost="True"
     Icon="pack://application:,,,/Bitbucket.Authentication;component/Assets/ADG3/Images/Bitbucket-16x16.ico">
     <Window.DataContext>
         <viewmodels:OAuthViewModel />

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`**/`
`25`	`25`
`26`	`26`	`using System;`
	`27`	`+using System.Windows.Input;`
`27`	`28`	`using GitHub.Shared.Controls;`
`28`	`29`	`using GitHub.Shared.Helpers;`
`29`	`30`
`@@ -44,10 +45,12 @@ protected override void SetFocus()`
`44`	`45`	`if (string.IsNullOrWhiteSpace(loginTextBox.Text))`
`45`	`46`	`{`
`46`	`47`	`loginTextBox.TryFocus().Wait(TimeSpan.FromSeconds(1));`
	`48`	`+ Keyboard.Focus(loginTextBox);`
`47`	`49`	`}`
`48`	`50`	`else`
`49`	`51`	`{`
`50`	`52`	`passwordTextBox.TryFocus().Wait(TimeSpan.FromSeconds(1));`
	`53`	`+ Keyboard.Focus(passwordTextBox);`
`51`	`54`	`}`
`52`	`55`	`}`
`53`	`56`	`}`