fix command bindings

VeloeMinecraftLauncher/ViewModels/MessageWindowViewModel.cs

@@ -132,18 +132,18 @@ public class MessageWindowViewModel : ViewModelBase
         }
     }
 
-    public void CloseWindow(Window window)
+    public void CloseWindow(object window)
     {
-        window?.Close();
+        ((Window)window)?.Close();
     }
 
-    public void CloseWindowOk(Window window)
+    public void CloseWindowOk(object window)
     {
-        window?.Close(true);
+        ((Window)window)?.Close(true);
     }
 
-    public void CloseWindowCancel(Window window)
+    public void CloseWindowCancel(object window)
     {
-        window?.Close(false);
+        ((Window)window)?.Close(false);
     }
 }

VeloeMinecraftLauncher/ViewModels/SettingsWindowViewModel.cs

@@ -177,10 +177,11 @@ public class SettingsWindowViewModel : ViewModelBase
         Settings.SaveSettings();
     }
 
-    public void OpenMinecraftPathDialog(Window window)
+    public void OpenMinecraftPathDialog(object window)
     {
         Task.Run(async() =>
         {
+            var storageProvider = ((Window)window).StorageProvider;
             var initPath = String.Empty;
 
             if (string.IsNullOrEmpty(Settings.minecraftForlderPath))
@@ -189,10 +190,10 @@ public class SettingsWindowViewModel : ViewModelBase
             var folderPickerOpenOptions = new FolderPickerOpenOptions() 
             {
                 AllowMultiple = false,
-                SuggestedStartLocation = await window.StorageProvider.TryGetFolderFromPathAsync(initPath)
+                SuggestedStartLocation = await storageProvider.TryGetFolderFromPathAsync(initPath)
             };
 
-            var result = await window.StorageProvider.OpenFolderPickerAsync(folderPickerOpenOptions);
+            var result = await storageProvider.OpenFolderPickerAsync(folderPickerOpenOptions);
 
             if (result is null || result.Count != 1 || result.First().Path.AbsolutePath == String.Empty)
                 return;
@@ -201,10 +202,11 @@ public class SettingsWindowViewModel : ViewModelBase
         });
     }
 
-    public void OpenJavaPathDialog(Window window)
+    public void OpenJavaPathDialog(object window)
     {
         Task.Run(async() =>
         {
+            var storageProvider = ((Window)window).StorageProvider;
             var initPath = String.Empty;
 
             if (string.IsNullOrEmpty(Settings.javaPath))
@@ -213,10 +215,10 @@ public class SettingsWindowViewModel : ViewModelBase
             var folderPickerOpenOptions = new FolderPickerOpenOptions()
             {
                 AllowMultiple = false,
-                SuggestedStartLocation = await window.StorageProvider.TryGetFolderFromPathAsync(initPath)
+                SuggestedStartLocation = await storageProvider.TryGetFolderFromPathAsync(initPath)
             };
 
-            var result = await window.StorageProvider.OpenFolderPickerAsync(folderPickerOpenOptions);
+            var result = await storageProvider.OpenFolderPickerAsync(folderPickerOpenOptions);
 
             if (result is null || result.Count != 1 || result.First().Path.AbsolutePath == String.Empty)
                 return;

VeloeMinecraftLauncher/Views/MessageWindow.axaml

@@ -28,7 +28,7 @@
 					BackgroundSource="Digger"
 					TintColor="{Binding InterfaceColor}"
 					TintOpacity="1"
-					MaterialOpacity="{Binding MaterialOpacity}" />
+					MaterialOpacity="{Binding MaterialOpacity}"/>
 			</ExperimentalAcrylicBorder.Material>
 		</ExperimentalAcrylicBorder>
 		<DockPanel>
@@ -38,8 +38,7 @@
 			  IsMaximizeVisible="False"
 			  TitleText="Message"
 			  DockPanel.Dock="Top"
-			  x:Name="titleBar"
-			>
+			  x:Name="titleBar">
 			</titlebars:TitleBarWindow>
 			<Grid
 				DockPanel.Dock="Bottom"
@@ -49,15 +48,12 @@
 					<RowDefinition Height="*"/>
 					<RowDefinition Height="35"/>
 				</Grid.RowDefinitions>
-
 					<TextBlock
 						Grid.Row="0"
 						Text="{Binding Message}" 
 						TextWrapping="Wrap"
 						HorizontalAlignment="{Binding HorizontalAlignment}"
-						VerticalAlignment="{Binding	VerticalAlignment}"
-					>
-					</TextBlock>		
+						VerticalAlignment="{Binding	VerticalAlignment}"/>		
 					<TextBox 
 						Grid.Row="1"
 						Text="{Binding ErrorTrace}" 
@@ -65,9 +61,7 @@
 						IsReadOnly="True" 
 						Margin="0 10 0  10"
 						HorizontalAlignment="Stretch" 
-						VerticalAlignment="Stretch">
-					</TextBox>
-
+						VerticalAlignment="Stretch"/>
 				<StackPanel
 					Grid.Row="2"
 					HorizontalAlignment="Right"
@@ -75,8 +69,7 @@
 					<Button
 						Content="{Binding ButtonText}"
 						IsVisible="{Binding	IsLogButtonVisible}"
-						Command="{Binding OpenLogFile}"
-					/>
+						Command="{Binding OpenLogFile}"/>
 					<Button
 						Content="{Binding ButtonCancel}"
 						IsCancel="True"
@@ -91,12 +84,10 @@
 						IsCancel="{Binding !IsCancelButtonVisible}"
 						Width="40"
 						Margin="10 0 0 0"
-						Command="{Binding CloseWindowOk}" 
-						CommandParameter="{Binding $parent[Window]}"
-					/>
+						Command="{Binding CloseWindowOk}"
+						CommandParameter="{Binding $parent[Window]}"/>
 				</StackPanel>	
-			</Grid>
-										
+			</Grid>							
 		</DockPanel>
 	</Panel>
 </Window>