SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 18:11:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable Mica, change FluentDialog a bit

Browse Source 
rip mica :(
This commit is contained in:
pizzaboxer 2023-06-29 23:21:43 +01:00
parent 2f005fa6fd
commit afbe9f4b90
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
5 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bloxstrap/Bootstrapper.cs
View File

@ -127,8 +127,6 @@ namespace Bloxstrap
{ {
App.Logger.WriteLine("[Bootstrapper::Run] Running bootstrapper"); App.Logger.WriteLine("[Bootstrapper::Run] Running bootstrapper");
Controls.ShowMessageBox("hi :D", MessageBoxImage.Error, MessageBoxButton.YesNoCancel);
if (App.IsUninstall) if (App.IsUninstall)
{ {
Uninstall(); Uninstall();

2
Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs
View File

@ -13,6 +13,7 @@ namespace Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels
{ {
public event PropertyChangedEventHandler? PropertyChanged; public event PropertyChangedEventHandler? PropertyChanged;
public void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); public void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
private readonly IBootstrapperDialog _dialog; private readonly IBootstrapperDialog _dialog;
public ICommand CancelInstallCommand => new RelayCommand(CancelInstall); public ICommand CancelInstallCommand => new RelayCommand(CancelInstall);
@ -23,6 +24,7 @@ namespace Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels
public bool ProgressIndeterminate { get; set; } = true; public bool ProgressIndeterminate { get; set; } = true;
public int ProgressValue { get; set; } = 0; public int ProgressValue { get; set; } = 0;
public bool CancelButtonEnabled { get; set; } = false;
public Visibility CancelButtonVisibility { get; set; } = Visibility.Collapsed; public Visibility CancelButtonVisibility { get; set; } = Visibility.Collapsed;
public string CancelButtonText { get; set; } = "Cancel"; public string CancelButtonText { get; set; } = "Cancel";

29
Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml
View File

@ -6,18 +6,22 @@
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d" mc:Ignorable="d"
Width="420" Width="420"
Height="192" MinHeight="0"
MinHeight="191" SizeToContent="Height"
MaxHeight="192"
ResizeMode="NoResize" ResizeMode="NoResize"
Background="{ui:ThemeResource ApplicationBackgroundBrush}" Background="{ui:ThemeResource ApplicationBackgroundBrush}"
ExtendsContentIntoTitleBar="True" ExtendsContentIntoTitleBar="True"
WindowBackdropType="Mica"
WindowCornerPreference="Round"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">
<StackPanel> <Grid>
<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.RowDefinitions>
<Grid Margin="16,0,16,0"> <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> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
@ -32,8 +36,9 @@
<ProgressBar Margin="16,16,0,16" IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}" Value="{Binding ProgressValue, Mode=OneWay}" /> <ProgressBar Margin="16,16,0,16" IsIndeterminate="{Binding ProgressIndeterminate, Mode=OneWay}" Value="{Binding ProgressValue, Mode=OneWay}" />
</StackPanel> </StackPanel>
</Grid> </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}" /> <Border Grid.Row="2" Padding="15" Background="{ui:ThemeResource SolidBackgroundFillColorSecondaryBrush}">
</StackPanel> <Button Margin="0" Content="{Binding CancelButtonText, Mode=OneWay}" Width="120" HorizontalAlignment="Right" IsEnabled="{Binding CancelButtonEnabled, Mode=OneWay}" Command="{Binding CancelInstallCommand}" />
</StackPanel> </Border>
</Grid>
</ui:UiWindow> </ui:UiWindow>

7
Bloxstrap/UI/Menu/Views/MainWindow.xaml
View File

@ -13,12 +13,7 @@
Height="580" Height="580"
Background="{ui:ThemeResource ApplicationBackgroundBrush}" Background="{ui:ThemeResource ApplicationBackgroundBrush}"
ExtendsContentIntoTitleBar="True" ExtendsContentIntoTitleBar="True"
WindowBackdropType="Mica"
WindowCornerPreference="Round"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">
<!--AllowsTransparency="True"
WindowStyle="None"
WindowBackdropType="Acrylic"-->
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@ -26,7 +21,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </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 x:Name="RootGrid" Grid.Row="1" Margin="13,5,0,0" Visibility="Visible">
<Grid.RowDefinitions> <Grid.RowDefinitions>

7
Bloxstrap/UI/MessageBox/FluentMessageBox.xaml
View File

@ -7,6 +7,7 @@
xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox" xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox"
mc:Ignorable="d" mc:Ignorable="d"
Title="Bloxstrap" Title="Bloxstrap"
d:DesignWidth="480"
MinWidth="180" MinWidth="180"
MaxWidth="480" MaxWidth="480"
Width="180" Width="180"
@ -15,8 +16,6 @@
ResizeMode="NoResize" ResizeMode="NoResize"
Background="{ui:ThemeResource ApplicationBackgroundBrush}" Background="{ui:ThemeResource ApplicationBackgroundBrush}"
ExtendsContentIntoTitleBar="True" ExtendsContentIntoTitleBar="True"
WindowBackdropType="Mica"
WindowCornerPreference="Round"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -25,9 +24,9 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </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> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />