Merge fixes

goatcorp · Mar 27, 2019 · c73eb10 · c73eb10
2 parents 45263df + af0276a
commit c73eb10
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/XIVLauncher/FirstTimeSetup.xaml.cs b/XIVLauncher/FirstTimeSetup.xaml.cs
@@ -20,8 +20,6 @@ namespace XIVLauncher
     /// </summary>
     public partial class FirstTimeSetup : Window
     {
-        private int _step = 0;
-
         public FirstTimeSetup()
         {
             InitializeComponent();

diff --git a/XIVLauncher/MainWindow.xaml b/XIVLauncher/MainWindow.xaml
@@ -111,7 +111,7 @@
                                  PreviewTextInput="OtpTextBox_OnPreviewTextInput" TextChanged="OtpTextBox_OnTextChanged"  MaxLength="6" x:Name="OtpTextBox" />
                     </StackPanel>
                 </materialDesign:DialogHost.DialogContent>
-                <materialDesign:Card Margin="559,10,0,0" Height="213" HorizontalAlignment="Left" Width="192">
+                <materialDesign:Card Margin="559,10,0,0" Height="213" HorizontalAlignment="Left" Width="192" KeyDown="Card_KeyDown">
                     <Grid VerticalAlignment="Stretch" Margin="-122,-38,-114,-51">
                         <TextBox x:Name="LoginUsername" HorizontalAlignment="Left" Height="23" Margin="155,65,0,0"
                                  TextWrapping="Wrap" VerticalAlignment="Top" Width="120"

diff --git a/XIVLauncher/MainWindow.xaml.cs b/XIVLauncher/MainWindow.xaml.cs
@@ -412,5 +412,13 @@ private void OtpTextBox_OnTextChanged(object sender, TextChangedEventArgs e)
                 StartGame();
             }
         }
+
+        private void Card_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter || e.Key == Key.Return)
+            {
+                HandleLogin(false);
+            }
+        }
     }
 }