From b9656896d7b08c6cf7a7797d60a168a41468c792 Mon Sep 17 00:00:00 2001
From: trawzified <55751269+tr4wzified@users.noreply.github.com>
Date: Fri, 29 Dec 2023 01:21:08 +0100
Subject: [PATCH] Show 3 tiles next to each other by default, styling tweakings

---
 Wabbajack.App.Wpf/Themes/Styles.xaml          | 26 +++++++++----------
 .../ViewModels/Gallery/ModListGalleryVM.cs    |  1 -
 Wabbajack.App.Wpf/Views/MainWindow.xaml       |  2 +-
 .../Views/ModListGalleryView.xaml             | 16 +++++-------
 Wabbajack.App.Wpf/Views/ModListTileView.xaml  |  6 ++---
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/Wabbajack.App.Wpf/Themes/Styles.xaml b/Wabbajack.App.Wpf/Themes/Styles.xaml
index 03dc6f79..8052de5c 100644
--- a/Wabbajack.App.Wpf/Themes/Styles.xaml
+++ b/Wabbajack.App.Wpf/Themes/Styles.xaml
@@ -152,7 +152,7 @@
     <SolidColorBrush x:Key="ScrollViewerBackground" Color="{StaticResource DarkBackgroundColor}" />
     <SolidColorBrush x:Key="VerticalScrollBarBackground" 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="ScrollBarHotThumb" Color="#CCCCCC" />
     <SolidColorBrush x:Key="ScrollBarSelectedThumb" Color="#E5E5E5" />
@@ -453,22 +453,22 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollBar}">
                     <Grid
-                        x:Name="Bg"
-                        Background="{TemplateBinding Background}"
-                        SnapsToDevicePixels="true">
+                    x:Name="Bg"
+                    Background="{TemplateBinding Background}"
+                    SnapsToDevicePixels="true">
                         <Grid.RowDefinitions>
                             <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
                             <RowDefinition Height="0.00001*" />
                             <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
                         </Grid.RowDefinitions>
                         <RepeatButton
-                            Command="{x:Static ScrollBar.LineUpCommand}"
-                            IsEnabled="{TemplateBinding IsMouseOver}"
-                            Style="{StaticResource RepeatButtonUpStyle}" />
+                        Command="{x:Static ScrollBar.LineUpCommand}"
+                        IsEnabled="{TemplateBinding IsMouseOver}"
+                        Style="{StaticResource RepeatButtonUpStyle}" />
                         <Track Grid.Row="1"
-                            x:Name="PART_Track"
-                            IsDirectionReversed="true"
-                            IsEnabled="{TemplateBinding IsMouseOver}">
+                        x:Name="PART_Track"
+                        IsDirectionReversed="true"
+                        IsEnabled="{TemplateBinding IsMouseOver}">
                             <Track.DecreaseRepeatButton>
                                 <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
                             </Track.DecreaseRepeatButton>
@@ -480,9 +480,9 @@
                             </Track.Thumb>
                         </Track>
                         <RepeatButton Grid.Row="2"
-                            Command="{x:Static ScrollBar.LineDownCommand}"
-                            IsEnabled="{TemplateBinding IsMouseOver}"
-                            Style="{DynamicResource RepeatButtonDownStyle}" />
+                        Command="{x:Static ScrollBar.LineDownCommand}"
+                        IsEnabled="{TemplateBinding IsMouseOver}"
+                        Style="{DynamicResource RepeatButtonDownStyle}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
diff --git a/Wabbajack.App.Wpf/ViewModels/Gallery/ModListGalleryVM.cs b/Wabbajack.App.Wpf/ViewModels/Gallery/ModListGalleryVM.cs
index a9336974..bd4821fb 100644
--- a/Wabbajack.App.Wpf/ViewModels/Gallery/ModListGalleryVM.cs
+++ b/Wabbajack.App.Wpf/ViewModels/Gallery/ModListGalleryVM.cs
@@ -184,7 +184,6 @@ namespace Wabbajack
                     .Filter(showNSFWFilter)
                     .Filter(gameFilter)
                     .Sort(searchSorter)
-                    .Sort(SortExpressionComparer<ModListMetadataVM>.Descending(modlist => !modlist.IsBroken))
                     .TreatMovesAsRemoveAdd()
                     .Bind(out _filteredModLists)
                     .Subscribe((_) =>
diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml b/Wabbajack.App.Wpf/Views/MainWindow.xaml
index b1f7bd43..26b27b92 100644
--- a/Wabbajack.App.Wpf/Views/MainWindow.xaml
+++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml
@@ -64,7 +64,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <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.Resources>
                             <DataTemplate DataType="{x:Type local:CompilerVM}">
diff --git a/Wabbajack.App.Wpf/Views/ModListGalleryView.xaml b/Wabbajack.App.Wpf/Views/ModListGalleryView.xaml
index 8a90c7a6..f1546e02 100644
--- a/Wabbajack.App.Wpf/Views/ModListGalleryView.xaml
+++ b/Wabbajack.App.Wpf/Views/ModListGalleryView.xaml
@@ -22,7 +22,7 @@
         <Border Grid.Column="1"
             BorderBrush="Transparent"
             BorderThickness="0">
-            <ScrollViewer Background="Transparent" VerticalScrollBarVisibility="Auto">
+            <ScrollViewer Background="Transparent"  VerticalScrollBarVisibility="Auto">
                 <ItemsControl
                     x:Name="ModListGalleryControl"
                     HorizontalAlignment="Center"
@@ -79,8 +79,6 @@
         <Grid Grid.Row="0"
             HorizontalAlignment="Left"
             VerticalAlignment="Stretch"
-            MinWidth="256"
-            MaxWidth="480"
             Height="Auto">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -149,10 +147,10 @@
                 Foreground="{StaticResource ForegroundBrush}"
                 ToolTip="Show modlists from external repositories">
                     <CheckBox.LayoutTransform>
-                        <ScaleTransform ScaleX="1.6" ScaleY="1.6"/>
+                        <ScaleTransform ScaleX="1.4" ScaleY="1.4"/>
                     </CheckBox.LayoutTransform>
                 </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.Row="3" Margin="0, 10, 0, 0">
@@ -167,10 +165,10 @@
                 Foreground="{StaticResource ForegroundBrush}"
                 ToolTip="Only show Not Safe For Work (NSFW) modlists">
                     <CheckBox.LayoutTransform>
-                        <ScaleTransform ScaleX="1.6" ScaleY="1.6"/>
+                        <ScaleTransform ScaleX="1.4" ScaleY="1.4"/>
                     </CheckBox.LayoutTransform>
                 </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.Row="4" Margin="0, 10, 0, 0">
@@ -184,10 +182,10 @@
                 Foreground="{StaticResource ForegroundBrush}"
                 ToolTip="Show only modlists for games you have installed on your PC">
                     <CheckBox.LayoutTransform>
-                        <ScaleTransform ScaleX="1.6" ScaleY="1.6"/>
+                        <ScaleTransform ScaleX="1.4" ScaleY="1.4"/>
                     </CheckBox.LayoutTransform>
                 </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>
 
             <Button
diff --git a/Wabbajack.App.Wpf/Views/ModListTileView.xaml b/Wabbajack.App.Wpf/Views/ModListTileView.xaml
index 292c1458..91a09f13 100644
--- a/Wabbajack.App.Wpf/Views/ModListTileView.xaml
+++ b/Wabbajack.App.Wpf/Views/ModListTileView.xaml
@@ -48,7 +48,7 @@
     </UserControl.Resources>
     <Border
         x:Name="ModListTile"
-        Margin="8"
+        Margin="10, 0, 10, 16"
         Background="Transparent"
         CornerRadius="8"
         BorderThickness="0">
@@ -69,8 +69,8 @@
             </Style>
         </Border.Style>
         <Grid
-            Width="327"
-            Height="184"
+            Width="300"
+            Height="169"
             Background="Transparent">
             <Grid ClipToBounds="True">
                 <mahapps:ProgressRing x:Name="LoadingProgress" />