Skip to content

Commit

Permalink
Bring back Mica, fix theming, styling improvements
Browse files Browse the repository at this point in the history
yeah this new titlebar alignment is gonna look weird but just stick with me
  • Loading branch information
pizzaboxer committed Jul 16, 2023
1 parent 3422cdc commit 8a4adae
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Bloxstrap/UI/Elements/Bootstrapper/FluentDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<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" />
<ui:TitleBar Grid.Row="0" x:Name="RootTitleBar" Padding="8" Title="{Binding Title, Mode=OneTime}" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" ShowClose="False" />

<Grid Grid.Row="1" Margin="16">
<Grid Grid.Row="1" Margin="16,8,16,16">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
Expand Down
5 changes: 3 additions & 2 deletions Bloxstrap/UI/Elements/Menu/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
Height="580"
Background="{ui:ThemeResource ApplicationBackgroundBrush}"
ExtendsContentIntoTitleBar="True"
WindowBackdropType="Mica"
WindowStartupLocation="CenterScreen">
<Grid>
<Grid.RowDefinitions>
Expand All @@ -21,9 +22,9 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<ui:TitleBar Padding="15,15,0,10" x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="True" HelpClicked="OpenWiki" UseSnapLayout="True" Title="Bloxstrap Menu" Icon="pack://application:,,,/Bloxstrap.ico" />
<ui:TitleBar Padding="8" x:Name="RootTitleBar" Grid.Row="0" ForceShutdown="False" MinimizeToTray="False" ShowHelp="True" HelpClicked="OpenWiki" 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="12,12,0,0" Visibility="Visible">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
Expand Down
2 changes: 1 addition & 1 deletion wpfui
Submodule wpfui updated from 5f322e to 9cf63b

0 comments on commit 8a4adae

Please sign in to comment.