Revert "小改登录UI"

This reverts commit c5a0901.
sovetskyfish · Jun 1, 2020 · df76be1 · df76be1
1 parent 3d620d1
commit df76be1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/PixivFSUWP/LoginPage.xaml b/PixivFSUWP/LoginPage.xaml
@@ -76,7 +76,7 @@
     </Page.Resources>
     <Grid>
         <Image Source="Assets/LoginBG.jpg" Stretch="UniformToFill"/>
-        <Grid MinHeight="480" Width="400"
+        <Grid Height="480" Width="400"
               HorizontalAlignment="Center" VerticalAlignment="Center">
             <Grid.Background>
                 <AcrylicBrush BackgroundSource="Backdrop" TintOpacity="0.4" TintColor="{ThemeResource SystemAltHighColor}" FallbackColor="{ThemeResource SystemAltMediumColor}"/>
@@ -103,8 +103,6 @@
                 <Button x:Name="btnLogin" Click="BtnLogin_Click" Margin="5,3" HorizontalAlignment="Stretch" x:Uid="Login"
                         Style="{StaticResource LoginButtonStyle}" Background="{ThemeResource SystemAccentColor}" Foreground="{ThemeResource ButtonForegroundThemeBrush}"/>
                 <Button x:Name="btnReg" Click="BtnReg_Click" Margin="5,3" HorizontalAlignment="Stretch" x:Uid="Register"/>
-                <HyperlinkButton x:Name="btnTrouble" Click="BtnTrouble_Click" Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="5" x:Uid="LoginFailed"/>
-
             </StackPanel>
             <Grid x:Name="grdLoading" Margin="20" Visibility="Collapsed" Grid.Row="1" Grid.RowSpan="2">
                 <Grid.RowDefinitions>
@@ -114,6 +112,7 @@
                 </Grid.RowDefinitions>
                 <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" x:Uid="LoggingIn"/>
                 <ProgressRing x:Name="ringProgress" IsActive="False" Margin="20" Height="100" Width="100" Grid.Row="1"/>
+                <Button x:Name="btnTrouble" Click="BtnTrouble_Click" Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="5" x:Uid="LoginFailed"/>
             </Grid>
         </Grid>
         <Grid HorizontalAlignment="Right" VerticalAlignment="Bottom">

diff --git a/PixivFSUWP/LoginPage.xaml.cs b/PixivFSUWP/LoginPage.xaml.cs
@@ -150,17 +150,14 @@ private async void Login()
                 if (isCancelled) resetView();
                 else Frame.Navigate(typeof(MainPage),null, App.FromRightTransitionInfo);
             }
-            else
-            {
-                resetView();
-                btnTrouble.Visibility = Visibility.Visible;
-            }
+            else btnTrouble.Visibility = Visibility.Visible;
         }
 
         private async void BtnTrouble_Click(object sender, RoutedEventArgs e)
         {
             await Launcher.LaunchUriAsync(new
                 Uri(@"https://github.com/tobiichiamane/pixivfs-uwp/blob/master/TroubleShoot.md"));
+            resetView();
         }
 
         private void resetView()