PS2_Manager/Setup.axaml

@@ -5,13 +5,22 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="PS2_Manager.Setup"
         WindowStartupLocation="CenterScreen"
-        Title="Setup PS2 Manager"        
+        SystemDecorations="None"
+        Title="Setup"        
         Height="349"
         Width="598"
-        CanResize="False"
         Background="#201c29"
         Closing="Window_OnClosing">
-        <Grid Margin="20">
+    <Grid RowDefinitions="20, *">
+                <Grid Grid.Row="0">
+                        <Border Background="#35313d"
+                                PointerPressed="WindowDrag">
+                                <Grid ColumnDefinitions="*, 20">
+                                        <TextBlock Name="WindowTitle" FontSize="12" Text="Setup PS2 Manager" Padding="8,0,0,0" VerticalAlignment="Center"/>
+                                </Grid>
+                        </Border>
+                </Grid>
+                <Grid Grid.Row="1" Margin="20">
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                                 <TextBlock Name="InfoText1" Text="Welcome to PS2 Manager" HorizontalAlignment="Center"/>
                                 <Separator/>
@@ -20,4 +29,5 @@
                                         Click="OpenLibraryButton_OnClick"/>
                         </StackPanel>
                 </Grid>
+        </Grid>
 </Window>

PS2_Manager/Setup.axaml.cs

@@ -43,6 +43,8 @@ public partial class Setup : Window
     {
         Console.Info("Open Library Button Clicked");
         settings.library_path.SetValue("");
+        while (String.IsNullOrEmpty(settings.library_path.GetValue<string>()))
+        {
             var topLevel = TopLevel.GetTopLevel(this);
             var path = await topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
             {
@@ -52,21 +54,18 @@ public partial class Setup : Window
             try
             {
                 if (!String.IsNullOrEmpty(path[0].Path.LocalPath))
-            {
                     settings.library_path.SetValue(path[0].Path.LocalPath);
-                FinishSetup();
-            }
-                    
             }
             catch (Exception ex)
             {
                 Console.WriteLine(ex.Message);
             }
-        
+        }
+        FinishSetup();
     }
 
     private void Window_OnClosing(object? sender, WindowClosingEventArgs e)
     {
-        if(!this.SetupFinished) Environment.Exit(0);
+        if(!this.SetupFinished) e.Cancel = true;
     }
 }