Move altered padding to wpfui

pizzaboxer · Jun 28, 2023 · d27ca05 · d27ca05
1 parent 991005c
commit d27ca05
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 36 deletions.
diff --git a/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml
@@ -165,31 +165,31 @@
  </Grid.ColumnDefinitions>
 
  <TextBlock Grid.Row="0" Grid.Column="0" Text="Bloxstrap" FontSize="14" TextWrapping="Wrap" Margin="0,8,0,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
- <ui:CardAction Grid.Row="1" Grid.Column="0" Margin="0,8,8,0" Padding="16,13,16,12" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/blob/main/LICENSE">
+ <ui:CardAction Grid.Row="1" Grid.Column="0" Margin="0,8,8,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/blob/main/LICENSE">
  <StackPanel>
  <TextBlock FontSize="14" Text="Bloxstrap by pizzaboxer" />
  <TextBlock Margin="0,2,0,0" FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
  </StackPanel>
  </ui:CardAction>
- <ui:CardAction Grid.Row="1" Grid.Column="1" Margin="0,8,8,0" Padding="16,13,16,12" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/lepoco/wpfui/blob/main/LICENSE">
+ <ui:CardAction Grid.Row="1" Grid.Column="1" Margin="0,8,8,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/lepoco/wpfui/blob/main/LICENSE">
  <StackPanel>
  <TextBlock FontSize="14" Text="WPF-UI by lepoco" />
  <TextBlock Margin="0,2,0,0" FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
  </StackPanel>
  </ui:CardAction>
- <ui:CardAction Grid.Row="1" Grid.Column="2" Margin="0,8,0,0" Padding="16,13,16,12" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/securifybv/ShellLink/blob/master/LICENSE.txt">
+ <ui:CardAction Grid.Row="1" Grid.Column="2" Margin="0,8,0,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/securifybv/ShellLink/blob/master/LICENSE.txt">
  <StackPanel>
  <TextBlock FontSize="14" Text="ShellLink by securifybv" />
  <TextBlock Margin="0,2,0,0" FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
  </StackPanel>
  </ui:CardAction>
- <ui:CardAction Grid.Row="2" Grid.Column="0" Margin="0,8,8,0" Padding="16,13,16,12" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/Lachee/discord-rpc-csharp/blob/development/LICENSE">
+ <ui:CardAction Grid.Row="2" Grid.Column="0" Margin="0,8,8,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/Lachee/discord-rpc-csharp/blob/development/LICENSE">
  <StackPanel>
  <TextBlock FontSize="14" Text="DiscordRPC by Lachee" />
  <TextBlock Margin="0,2,0,0" FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
  </StackPanel>
  </ui:CardAction>
- <ui:CardAction Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,8,0,0" Padding="16,13,16,12" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/MaximumADHD/Roblox-Studio-Mod-Manager/blob/main/LICENSE">
+ <ui:CardAction Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,8,0,0" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/MaximumADHD/Roblox-Studio-Mod-Manager/blob/main/LICENSE">
  <StackPanel>
  <TextBlock FontSize="14" Text="Roblox Studio Mod Manager by MaximumADHD" />
  <TextBlock Margin="0,2,0,0" FontSize="12" Text="MIT License" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />

diff --git a/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml b/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml
@@ -12,7 +12,7 @@
  <StackPanel Margin="0,0,14,14">
  <TextBlock Text="Configure how Bloxstrap should look." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
- <ui:CardControl Margin="0,16,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,16,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Theme" />
@@ -21,7 +21,7 @@
  </ui:CardControl.Header>
  <ComboBox Width="200" Padding="10,5,10,5" ItemsSource="{Binding Themes.Keys, Mode=OneTime}" Text="{Binding Theme, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Style" />
@@ -30,7 +30,7 @@
  </ui:CardControl.Header>
  <ComboBox Width="200" Padding="10,5,10,5" ItemsSource="{Binding Dialogs.Keys, Mode=OneTime}" Text="{Binding Dialog, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Icon" />
@@ -50,7 +50,7 @@
  <ComboBox Grid.Column="1" Margin="5,0,0,0" Padding="10,5,10,5" ItemsSource="{Binding Icons.Keys, Mode=OneTime}" Text="{Binding Icon, Mode=TwoWay}" />
  </Grid>
  </ui:CardControl>
- <ui:CardExpander Margin="0,8,0,0" Padding="16,13,16,12" IsExpanded="False">
+ <ui:CardExpander Margin="0,8,0,0" IsExpanded="False">
  <ui:CardExpander.Header>
  <Grid>
  <Grid.ColumnDefinitions>

diff --git a/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml
@@ -11,7 +11,7 @@
  <StackPanel Margin="0,0,14,14">
  <TextBlock Text="Configure what Bloxstrap should do when starting up." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
- <ui:CardControl Margin="0,16,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,16,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Create desktop icon" />
@@ -20,7 +20,7 @@
  </ui:CardControl.Header>
  <ui:ToggleSwitch IsChecked="{Binding CreateDesktopIcon, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Automatically update Bloxstrap" />

diff --git a/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml
@@ -12,7 +12,7 @@
  <StackPanel Margin="0,0,14,14">
  <TextBlock Text="Control how specific Roblox engine parameters and features are configured." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
- <ui:CardAction x:Name="OpenClientSettingsCardAction" Grid.Row="1" Grid.ColumnSpan="2" Margin="0,16,0,0" Padding="16,13,16,12" Icon="DocumentEdit24" Command="{Binding OpenClientSettingsCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
+ <ui:CardAction x:Name="OpenClientSettingsCardAction" Grid.Row="1" Grid.ColumnSpan="2" Margin="0,16,0,0" Icon="DocumentEdit24" Command="{Binding OpenClientSettingsCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
  <StackPanel>
  <TextBlock FontSize="14" Text="Edit ClientAppSettings.json">
  <!--this is so fucking stupid the disabled state of the cardaction doesnt change the header text colour-->
@@ -42,7 +42,7 @@
  </ui:CardAction>
 
  <TextBlock Text="Presets" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Framerate limit" />
@@ -51,7 +51,7 @@
  </ui:CardControl.Header>
  <ui:TextBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" Text="{Binding FramerateLimit, Mode=TwoWay}" PreviewTextInput="ValidateInt32" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Preferred lighting technology" />
@@ -60,7 +60,7 @@
  </ui:CardControl.Header>
  <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding LightingTechnologies.Keys, Mode=OneTime}" Text="{Binding SelectedLightingTechnology, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Preferred escape menu version" />
@@ -69,7 +69,7 @@
  </ui:CardControl.Header>
  <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding IGMenuVersions.Keys, Mode=OneTime}" Text="{Binding SelectedIGMenuVersion, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Enable ability to hide GUIs" />
@@ -80,7 +80,7 @@
  </ui:CardControl.Header>
  <ui:ToggleSwitch IsChecked="{Binding GuiHidingEnabled, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Use old material textures" />
@@ -89,7 +89,7 @@
  </ui:CardControl.Header>
  <ui:ToggleSwitch IsChecked="{Binding Pre2022TexturesEnabled, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Rendering mode" />
@@ -98,7 +98,7 @@
  </ui:CardControl.Header>
  <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding RenderingModes.Keys, Mode=OneTime}" Text="{Binding SelectedRenderingMode, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Use alternate graphics quality selector" />

diff --git a/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml
@@ -12,7 +12,7 @@
  <StackPanel Margin="0,0,14,14">
  <TextBlock Text="Configure how Bloxstrap and Roblox are installed." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
- <ui:CardExpander Margin="0,16,0,0" Padding="16,13,16,12">
+ <ui:CardExpander Margin="0,16,0,0">
  <ui:CardExpander.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Install Location" />
@@ -29,7 +29,7 @@
  </Grid>
  </ui:CardExpander>
 
- <ui:CardAction x:Name="OpenFolderCardAction" Margin="0,8,0,0" Padding="16,13,16,12" Icon="Folder24" Command="{Binding OpenFolderCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
+ <ui:CardAction x:Name="OpenFolderCardAction" Margin="0,8,0,0" Icon="Folder24" Command="{Binding OpenFolderCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
  <StackPanel>
  <TextBlock FontSize="14" Text="Open Folder">
  <!--this is so fucking stupid the disabled state of the cardaction doesnt change the header text colour-->
@@ -47,7 +47,7 @@
  </StackPanel>
  </ui:CardAction>
 
- <ui:CardExpander Margin="0,8,0,0" Padding="16,13,16,12" IsExpanded="True">
+ <ui:CardExpander Margin="0,8,0,0" IsExpanded="True">
  <ui:CardExpander.Header>
  <Grid>
  <Grid.ColumnDefinitions>
@@ -121,7 +121,7 @@
  </Grid>
  </StackPanel>
  </ui:CardExpander>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Automatic channel change action" />

diff --git a/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml
@@ -13,7 +13,7 @@
  <TextBlock Text="Configure quick and easy ways to improve the Roblox gameplay experience." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
  <TextBlock Text="Discord Rich Presence" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Show game activity" />
@@ -22,7 +22,7 @@
  </ui:CardControl.Header>
  <ui:ToggleSwitch x:Name="DiscordActivityEnabledToggle" IsChecked="{Binding DiscordActivityEnabled, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12" IsEnabled="{Binding IsChecked, ElementName=DiscordActivityEnabledToggle, Mode=OneWay}">
+ <ui:CardControl Margin="0,8,0,0" IsEnabled="{Binding IsChecked, ElementName=DiscordActivityEnabledToggle, Mode=OneWay}">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Allow activity joining" />
@@ -33,7 +33,7 @@
  </ui:CardControl>
 
  <TextBlock Text="Miscellaneous" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Be notified of server details on game join" />
@@ -42,7 +42,7 @@
  </ui:CardControl.Header>
  <ui:ToggleSwitch IsChecked="{Binding ShowServerDetailsEnabled, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Allow multi-game instance launching" />

diff --git a/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml
@@ -21,7 +21,7 @@
  <ColumnDefinition Width="*" />
  <ColumnDefinition Width="*" />
  </Grid.ColumnDefinitions>
- <ui:CardAction Grid.Row="0" Grid.Column="0" x:Name="OpenModFolderCardAction" Margin="0,0,4,0" Padding="16,13,16,12" Icon="Folder24" Command="{Binding OpenModsFolderCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
+ <ui:CardAction Grid.Row="0" Grid.Column="0" x:Name="OpenModFolderCardAction" Margin="0,0,4,0" Icon="Folder24" Command="{Binding OpenModsFolderCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
  <StackPanel>
  <TextBlock FontSize="14" Text="Open Mods Folder">
  <!--this is so fucking stupid the disabled state of the cardaction doesnt change the header text colour-->
@@ -35,12 +35,14 @@
  </Style>
  </TextBlock.Style>
  </TextBlock>
+
  <TextBlock Margin="0,2,0,0" FontSize="12" Foreground="{DynamicResource TextFillColorTertiaryBrush}">
  <TextBlock.Style>
  <Style>
  <Setter Property="TextBlock.Text" Value="Manage custom Roblox mods here."/>
  <Style.Triggers>
  <DataTrigger Binding="{Binding ElementName=OpenModFolderCardAction, Path=IsEnabled, Mode=OneTime}" Value="False">
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />
  <Setter Property="TextBlock.Text" Value="Bloxstrap must first be installed." />
  </DataTrigger>
  </Style.Triggers>
@@ -49,7 +51,7 @@
  </TextBlock>
  </StackPanel>
  </ui:CardAction>
- <ui:CardAction Padding="16,13,16,12" Grid.Row="0" Grid.Column="1" Margin="4,0,0,0" Icon="BookQuestionMark24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/Adding-custom-mods">
+ <ui:CardAction Grid.Row="0" Grid.Column="1" Margin="4,0,0,0" Icon="BookQuestionMark24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/Adding-custom-mods">
  <StackPanel>
  <TextBlock FontSize="14" Text="Help" />
  <TextBlock Margin="0,2,0,0" FontSize="12" Text="See info about managing and creating mods." Padding="0,0,16,0" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
@@ -70,7 +72,7 @@
  <ColumnDefinition Width="*" />
  </Grid.ColumnDefinitions>
 
- <ui:CardControl Grid.Row="0" Grid.Column="0" Margin="0,8,4,0" Padding="16,13,16,12">
+ <ui:CardControl Grid.Row="0" Grid.Column="0" Margin="0,8,4,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Use old death sound" />
@@ -79,7 +81,7 @@
  </ui:CardControl.Header>
  <ui:ToggleSwitch IsChecked="{Binding OldDeathSoundEnabled, Mode=TwoWay}" />
  </ui:CardControl>
- <ui:CardControl Grid.Row="0" Grid.Column="1" Margin="4,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Grid.Row="0" Grid.Column="1" Margin="4,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Use old mouse cursor" />
@@ -89,7 +91,7 @@
  <ui:ToggleSwitch IsChecked="{Binding OldMouseCursorEnabled, Mode=TwoWay}" />
  </ui:CardControl>
 
- <ui:CardControl Grid.Row="1" Grid.ColumnSpan="2" Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Grid.Row="1" Grid.ColumnSpan="2" Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Emulate old character sounds" />
@@ -99,7 +101,7 @@
  <ui:ToggleSwitch IsChecked="{Binding OldCharacterSoundsEnabled, Mode=TwoWay}" />
  </ui:CardControl>
 
- <ui:CardControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Disable desktop app" />
@@ -109,7 +111,7 @@
  <ui:ToggleSwitch IsChecked="{Binding DisableAppPatchEnabled, Mode=TwoWay}" />
  </ui:CardControl>
 
- <ui:CardControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Preferred emoji type" />
@@ -122,7 +124,7 @@
 
  <StackPanel x:Name="MiscellaneousOptions">
  <TextBlock Text="Miscellaneous" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
- <ui:CardControl Margin="0,8,0,0" Padding="16,13,16,12">
+ <ui:CardControl Margin="0,8,0,0">
  <ui:CardControl.Header>
  <StackPanel>
  <TextBlock FontSize="14" Text="Disable fullscreen optimizations" />

diff --git a/wpfui b/wpfui