From afbe9f4b906df0ac20d194d9fade9c08a3c6cef8 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Thu, 29 Jun 2023 23:21:43 +0100
Subject: [PATCH] Disable Mica, change FluentDialog a bit

rip mica :(
---
 Bloxstrap/Bootstrapper.cs                     |  2 --
 .../WPF/ViewModels/FluentDialogViewModel.cs   |  2 ++
 .../WPF/Views/FluentDialog.xaml               | 29 +++++++++++--------
 Bloxstrap/UI/Menu/Views/MainWindow.xaml       |  7 +----
 Bloxstrap/UI/MessageBox/FluentMessageBox.xaml |  7 ++---
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
index 6a276ae6..33d2fabd 100644
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@@ -127,8 +127,6 @@ public async Task Run()
         {
             App.Logger.WriteLine("[Bootstrapper::Run] Running bootstrapper");
 
-            Controls.ShowMessageBox("hi :D", MessageBoxImage.Error, MessageBoxButton.YesNoCancel);
-
             if (App.IsUninstall)
             {
                 Uninstall();
diff --git a/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs
index 89c95c19..703e8682 100644
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs
@@ -13,6 +13,7 @@ public class FluentDialogViewModel : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler? PropertyChanged;
         public void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+
         private readonly IBootstrapperDialog _dialog;
 
         public ICommand CancelInstallCommand => new RelayCommand(CancelInstall);
@@ -23,6 +24,7 @@ public class FluentDialogViewModel : INotifyPropertyChanged
         public bool ProgressIndeterminate { get; set; } = true;
         public int ProgressValue { get; set; } = 0;
 
+        public bool CancelButtonEnabled { get; set; } = false;
         public Visibility CancelButtonVisibility { get; set; } = Visibility.Collapsed;
         public string CancelButtonText { get; set; } = "Cancel";
 
diff --git a/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml
index b5c1879d..0de1cce5 100644
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml
@@ -6,18 +6,22 @@
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         mc:Ignorable="d"
         Width="420"
-        Height="192" 
-        MinHeight="191"
-        MaxHeight="192"
+        MinHeight="0"
+        SizeToContent="Height"
         ResizeMode="NoResize"
         Background="{ui:ThemeResource ApplicationBackgroundBrush}"
         ExtendsContentIntoTitleBar="True"
-        WindowBackdropType="Mica"
-        WindowCornerPreference="Round"
         WindowStartupLocation="CenterScreen">
-    <StackPanel>
-        <ui:TitleBar Background="{ui:ThemeResource ApplicationBackgroundBrush}" Title="{Binding Title, Mode=OneTime}" Padding="15,15,0,10" x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="False" ShowClose="False" ShowMinimize="False" ShowMaximize="False" />
-        <Grid Margin="16,0,16,0">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+      
+        <ui:TitleBar Grid.Row="0"  x:Name="RootTitleBar" Padding="16,16,0,0" Title="{Binding Title, Mode=OneTime}" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" ShowClose="False" />
+      
+        <Grid Grid.Row="1" Margin="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
@@ -32,8 +36,9 @@
                 <ProgressBar Margin="16,16,0,16" IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}" Value="{Binding ProgressValue, Mode=OneWay}" />
             </StackPanel>
         </Grid>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Margin="8,16,16,16" Content="{Binding CancelButtonText, Mode=OneWay}" Width="120" HorizontalAlignment="Right" Visibility="{Binding CancelButtonVisibility, Mode=OneWay}" Command="{Binding CancelInstallCommand}" />
-        </StackPanel>
-    </StackPanel>
+
+        <Border Grid.Row="2" Padding="15" Background="{ui:ThemeResource SolidBackgroundFillColorSecondaryBrush}">
+            <Button Margin="0" Content="{Binding CancelButtonText, Mode=OneWay}" Width="120" HorizontalAlignment="Right" IsEnabled="{Binding CancelButtonEnabled, Mode=OneWay}" Command="{Binding CancelInstallCommand}" />
+        </Border>
+    </Grid>
 </ui:UiWindow>
diff --git a/Bloxstrap/UI/Menu/Views/MainWindow.xaml b/Bloxstrap/UI/Menu/Views/MainWindow.xaml
index 041ff70f..e30ea543 100644
--- a/Bloxstrap/UI/Menu/Views/MainWindow.xaml
+++ b/Bloxstrap/UI/Menu/Views/MainWindow.xaml
@@ -13,12 +13,7 @@
              Height="580"
              Background="{ui:ThemeResource ApplicationBackgroundBrush}"
              ExtendsContentIntoTitleBar="True"
-             WindowBackdropType="Mica"
-             WindowCornerPreference="Round"
              WindowStartupLocation="CenterScreen">
-  <!--AllowsTransparency="True"
-    WindowStyle="None"
-    WindowBackdropType="Acrylic"-->
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -26,7 +21,7 @@
       <RowDefinition Height="Auto" />
     </Grid.RowDefinitions>
 
-    <ui:TitleBar Background="{ui:ThemeResource ApplicationBackgroundBrush}" Padding="15,15,0,10" x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="True" Title="Bloxstrap Menu" Icon="pack://application:,,,/Bloxstrap.ico" />
+    <ui:TitleBar Padding="15,15,0,10" x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="False" UseSnapLayout="True" Title="Bloxstrap Menu" Icon="pack://application:,,,/Bloxstrap.ico" />
 
     <Grid x:Name="RootGrid" Grid.Row="1" Margin="13,5,0,0" Visibility="Visible">
       <Grid.RowDefinitions>
diff --git a/Bloxstrap/UI/MessageBox/FluentMessageBox.xaml b/Bloxstrap/UI/MessageBox/FluentMessageBox.xaml
index ca6f2ced..7169b844 100644
--- a/Bloxstrap/UI/MessageBox/FluentMessageBox.xaml
+++ b/Bloxstrap/UI/MessageBox/FluentMessageBox.xaml
@@ -7,6 +7,7 @@
         xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox"
         mc:Ignorable="d"
         Title="Bloxstrap"
+        d:DesignWidth="480"
         MinWidth="180"
         MaxWidth="480"
         Width="180"
@@ -15,8 +16,6 @@
         ResizeMode="NoResize"
         Background="{ui:ThemeResource ApplicationBackgroundBrush}"
         ExtendsContentIntoTitleBar="True"
-        WindowBackdropType="Mica"
-        WindowCornerPreference="Round"
         WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
@@ -25,9 +24,9 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <ui:TitleBar Grid.Row="0" Grid.ColumnSpan="2" Padding="8" Background="{ui:ThemeResource ApplicationBackgroundBrush}" x:Name="RootTitleBar" Title="Bloxstrap" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" KeyboardNavigation.TabNavigation="None" />
+        <ui:TitleBar Grid.Row="0" Grid.ColumnSpan="2" Padding="8" x:Name="RootTitleBar" Title="Bloxstrap" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" KeyboardNavigation.TabNavigation="None" />
 
-        <Grid Grid.Row="1" Margin="15,15,15,15">
+        <Grid Grid.Row="1" Margin="15">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />