Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show 3 tiles next to each other by default, styling tweakings

Browse Source
This commit is contained in:
trawzified 2023-12-29 01:21:08 +01:00
parent 8275c71e43
commit b9656896d7
5 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Wabbajack.App.Wpf/Themes/Styles.xaml
View File

@ -152,7 +152,7 @@
<SolidColorBrush x:Key="ScrollViewerBackground" Color="{StaticResource DarkBackgroundColor}" /> <SolidColorBrush x:Key="ScrollViewerBackground" Color="{StaticResource DarkBackgroundColor}" />
<SolidColorBrush x:Key="VerticalScrollBarBackground" Color="{StaticResource BackgroundColor}" /> <SolidColorBrush x:Key="VerticalScrollBarBackground" Color="{StaticResource BackgroundColor}" />
<SolidColorBrush x:Key="HorizontalScrollBarBackground" Color="{StaticResource BackgroundColor}" /> <SolidColorBrush x:Key="HorizontalScrollBarBackground" Color="{StaticResource BackgroundColor}" />
<SolidColorBrush x:Key="VerticalScrollBarThumb" Color="#808080" /> <SolidColorBrush x:Key="VerticalScrollBarThumb" Color="{StaticResource Primary}" />
<SolidColorBrush x:Key="ScrollBarDisabledBackground" Color="{StaticResource BackgroundColor}" /> <SolidColorBrush x:Key="ScrollBarDisabledBackground" Color="{StaticResource BackgroundColor}" />
<SolidColorBrush x:Key="ScrollBarHotThumb" Color="#CCCCCC" /> <SolidColorBrush x:Key="ScrollBarHotThumb" Color="#CCCCCC" />
<SolidColorBrush x:Key="ScrollBarSelectedThumb" Color="#E5E5E5" /> <SolidColorBrush x:Key="ScrollBarSelectedThumb" Color="#E5E5E5" />
@ -453,22 +453,22 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ScrollBar}"> <ControlTemplate TargetType="{x:Type ScrollBar}">
<Grid <Grid
x:Name="Bg" x:Name="Bg"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
SnapsToDevicePixels="true"> SnapsToDevicePixels="true">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" /> <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
<RowDefinition Height="0.00001*" /> <RowDefinition Height="0.00001*" />
<RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" /> <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<RepeatButton <RepeatButton
Command="{x:Static ScrollBar.LineUpCommand}" Command="{x:Static ScrollBar.LineUpCommand}"
IsEnabled="{TemplateBinding IsMouseOver}" IsEnabled="{TemplateBinding IsMouseOver}"
Style="{StaticResource RepeatButtonUpStyle}" /> Style="{StaticResource RepeatButtonUpStyle}" />
<Track Grid.Row="1" <Track Grid.Row="1"
x:Name="PART_Track" x:Name="PART_Track"
IsDirectionReversed="true" IsDirectionReversed="true"
IsEnabled="{TemplateBinding IsMouseOver}"> IsEnabled="{TemplateBinding IsMouseOver}">
<Track.DecreaseRepeatButton> <Track.DecreaseRepeatButton>
<RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}" /> <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
</Track.DecreaseRepeatButton> </Track.DecreaseRepeatButton>
@ -480,9 +480,9 @@
</Track.Thumb> </Track.Thumb>
</Track> </Track>
<RepeatButton Grid.Row="2" <RepeatButton Grid.Row="2"
Command="{x:Static ScrollBar.LineDownCommand}" Command="{x:Static ScrollBar.LineDownCommand}"
IsEnabled="{TemplateBinding IsMouseOver}" IsEnabled="{TemplateBinding IsMouseOver}"
Style="{DynamicResource RepeatButtonDownStyle}" /> Style="{DynamicResource RepeatButtonDownStyle}" />
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false"> <Trigger Property="IsEnabled" Value="false">

1
Wabbajack.App.Wpf/ViewModels/Gallery/ModListGalleryVM.cs
View File

@ -184,7 +184,6 @@ namespace Wabbajack
.Filter(showNSFWFilter) .Filter(showNSFWFilter)
.Filter(gameFilter) .Filter(gameFilter)
.Sort(searchSorter) .Sort(searchSorter)
.Sort(SortExpressionComparer<ModListMetadataVM>.Descending(modlist => !modlist.IsBroken))
.TreatMovesAsRemoveAdd() .TreatMovesAsRemoveAdd()
.Bind(out _filteredModLists) .Bind(out _filteredModLists)
.Subscribe((_) => .Subscribe((_) =>

2
Wabbajack.App.Wpf/Views/MainWindow.xaml
View File

@ -64,7 +64,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<local:NavigationView Grid.Column="0" ViewModel="{Binding NavigationVM}" /> <local:NavigationView Grid.Column="0" ViewModel="{Binding NavigationVM}" />
<Border Grid.Column="1" Margin="0" Background="{StaticResource ComplementaryBackgroundBrush}" x:Name="MainContent" Padding="28" CornerRadius="8"> <Border Grid.Column="1" Margin="0" Background="{StaticResource ComplementaryBackgroundBrush}" x:Name="MainContent" Padding="18" CornerRadius="8">
<ContentPresenter Content="{Binding ActivePane}" VerticalAlignment="Stretch"> <ContentPresenter Content="{Binding ActivePane}" VerticalAlignment="Stretch">
<ContentPresenter.Resources> <ContentPresenter.Resources>
<DataTemplate DataType="{x:Type local:CompilerVM}"> <DataTemplate DataType="{x:Type local:CompilerVM}">

16
Wabbajack.App.Wpf/Views/ModListGalleryView.xaml
View File

@ -22,7 +22,7 @@
<Border Grid.Column="1" <Border Grid.Column="1"
BorderBrush="Transparent" BorderBrush="Transparent"
BorderThickness="0"> BorderThickness="0">
<ScrollViewer Background="Transparent" VerticalScrollBarVisibility="Auto"> <ScrollViewer Background="Transparent" VerticalScrollBarVisibility="Auto">
<ItemsControl <ItemsControl
x:Name="ModListGalleryControl" x:Name="ModListGalleryControl"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@ -79,8 +79,6 @@
<Grid Grid.Row="0" <Grid Grid.Row="0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
MinWidth="256"
MaxWidth="480"
Height="Auto"> Height="Auto">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
@ -149,10 +147,10 @@
Foreground="{StaticResource ForegroundBrush}" Foreground="{StaticResource ForegroundBrush}"
ToolTip="Show modlists from external repositories"> ToolTip="Show modlists from external repositories">
<CheckBox.LayoutTransform> <CheckBox.LayoutTransform>
<ScaleTransform ScaleX="1.6" ScaleY="1.6"/> <ScaleTransform ScaleX="1.4" ScaleY="1.4"/>
</CheckBox.LayoutTransform> </CheckBox.LayoutTransform>
</CheckBox> </CheckBox>
<TextBlock Grid.Column="1" Margin="5, 0, 0, 0" Text="Show unofficial modlists" FontSize="14" VerticalAlignment="Center" /> <TextBlock Grid.Column="1" Margin="3, 0, 0, 0" Text="Show unofficial modlists" FontSize="14" VerticalAlignment="Center" />
</Grid> </Grid>
<Grid Grid.Row="3" Margin="0, 10, 0, 0"> <Grid Grid.Row="3" Margin="0, 10, 0, 0">
@ -167,10 +165,10 @@
Foreground="{StaticResource ForegroundBrush}" Foreground="{StaticResource ForegroundBrush}"
ToolTip="Only show Not Safe For Work (NSFW) modlists"> ToolTip="Only show Not Safe For Work (NSFW) modlists">
<CheckBox.LayoutTransform> <CheckBox.LayoutTransform>
<ScaleTransform ScaleX="1.6" ScaleY="1.6"/> <ScaleTransform ScaleX="1.4" ScaleY="1.4"/>
</CheckBox.LayoutTransform> </CheckBox.LayoutTransform>
</CheckBox> </CheckBox>
<TextBlock Grid.Column="1" Margin="5, 0, 0, 0" Text="Show only NSFW modlists" FontSize="14" VerticalAlignment="Center" /> <TextBlock Grid.Column="1" Margin="3, 0, 0, 0" Text="Show only NSFW modlists" FontSize="14" VerticalAlignment="Center" />
</Grid> </Grid>
<Grid Grid.Row="4" Margin="0, 10, 0, 0"> <Grid Grid.Row="4" Margin="0, 10, 0, 0">
@ -184,10 +182,10 @@
Foreground="{StaticResource ForegroundBrush}" Foreground="{StaticResource ForegroundBrush}"
ToolTip="Show only modlists for games you have installed on your PC"> ToolTip="Show only modlists for games you have installed on your PC">
<CheckBox.LayoutTransform> <CheckBox.LayoutTransform>
<ScaleTransform ScaleX="1.6" ScaleY="1.6"/> <ScaleTransform ScaleX="1.4" ScaleY="1.4"/>
</CheckBox.LayoutTransform> </CheckBox.LayoutTransform>
</CheckBox> </CheckBox>
<TextBlock Grid.Column="1" Margin="5, 0, 0, 0" Text="Show only modlists for installed games" FontSize="14" VerticalAlignment="Center" /> <TextBlock Grid.Column="1" Margin="3, 0, 0, 0" Text="Show only modlists for installed games" FontSize="14" VerticalAlignment="Center" />
</Grid> </Grid>
<Button <Button

6
Wabbajack.App.Wpf/Views/ModListTileView.xaml
View File

@ -48,7 +48,7 @@
</UserControl.Resources> </UserControl.Resources>
<Border <Border
x:Name="ModListTile" x:Name="ModListTile"
Margin="8" Margin="10, 0, 10, 16"
Background="Transparent" Background="Transparent"
CornerRadius="8" CornerRadius="8"
BorderThickness="0"> BorderThickness="0">
@ -69,8 +69,8 @@
</Style> </Style>
</Border.Style> </Border.Style>
<Grid <Grid
Width="327" Width="300"
Height="184" Height="169"
Background="Transparent"> Background="Transparent">
<Grid ClipToBounds="True"> <Grid ClipToBounds="True">
<mahapps:ProgressRing x:Name="LoadingProgress" /> <mahapps:ProgressRing x:Name="LoadingProgress" />