Re-added styles from a previous branch

Nexus-Mods · Oct 15, 2024 · 33720e1 · 33720e1
1 parent bbf67d1
commit 33720e1
Show file tree

Hide file tree

Showing 4 changed files with 210 additions and 78 deletions.
diff --git a/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml b/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml
@@ -49,7 +49,7 @@
 
     <panels:FlexPanel x:Name="Body">
 
-
+        <Border x:Name="HeaderBorderBackground">
             <Border x:Name="HeaderBorder">
                 <panels:FlexPanel x:Name="Header">
 
@@ -104,6 +104,7 @@
                     </Border>
                 </panels:FlexPanel>
             </Border>
+        </Border>
 
         <Border x:Name="ListHeaderRowBorder">
             <panels:FlexPanel x:Name="ListHeaderRow">
@@ -114,26 +115,33 @@
             </panels:FlexPanel>
         </Border>
 
+        <TabControl>
+            <TabItem>
+                <TabItem.Header>
+                    <panels:FlexPanel x:Name="RequiredModsFlexPanel">
+                        <TextBlock>Required</TextBlock>
+                        <Border>
+                            <TextBlock x:Name="RequiredModsCount" />
+                        </Border>
+                    </panels:FlexPanel>
+                </TabItem.Header>
+                <!-- TreeDataGrid -->
+                <TextBlock>TODO: Required mods will appear here</TextBlock>
+            </TabItem>
+            <TabItem>
+                <TabItem.Header>
+                    <panels:FlexPanel x:Name="OptionalModsFlexPanel">
+                        <TextBlock>Optional</TextBlock>
+                        <Border>
+                            <TextBlock x:Name="OptionalModsCount" />
+                        </Border>
+                    </panels:FlexPanel>
+                </TabItem.Header>
+                <!-- TreeDataGrid -->
+                <TextBlock>TODO: Optional mods will appear here</TextBlock>
+            </TabItem>
+        </TabControl>
 
-        <!-- not touching these for now -->
-        <Expander>
-            <Expander.Header>
-                <panels:FlexPanel>
-                    <TextBlock>Required</TextBlock>
-                    <TextBlock x:Name="RequiredModsCount" />
-                </panels:FlexPanel>
-            </Expander.Header>
-            <TextBlock>TODO: Grid of mods will appear here</TextBlock>
-        </Expander>
-        <Expander>
-            <Expander.Header>
-                <panels:FlexPanel>
-                    <TextBlock>Optional</TextBlock>
-                    <TextBlock x:Name="OptionalModsCount" />
-                </panels:FlexPanel>
-            </Expander.Header>
-            <TextBlock>TODO: Grid of mods will appear here</TextBlock>
-        </Expander>
     </panels:FlexPanel>
 
 </reactiveUi:ReactiveUserControl>
diff --git a/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml.cs b/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml.cs
@@ -17,7 +17,7 @@ public CollectionDownloadView()
                 // Uncomment this to enable the background image
                  this.WhenAnyValue(view => view.ViewModel!.BackgroundImage)
                      .WhereNotNull()
-                     .SubscribeWithErrorLogging(image => Body.Background = new ImageBrush { Source = image, Stretch = Stretch.UniformToFill})
+                     .SubscribeWithErrorLogging(image => HeaderBorderBackground.Background = new ImageBrush { Source = image, Stretch = Stretch.UniformToFill, AlignmentY = AlignmentY.Top})
                      .DisposeWith(d);
 
                 this.WhenAnyValue(view => view.ViewModel!.TileImage)

diff --git a/...ods.Themes.NexusFluentDark/Styles/UserControls/CollectionCards/CollectionCardStyles.axaml b/...ods.Themes.NexusFluentDark/Styles/UserControls/CollectionCards/CollectionCardStyles.axaml
@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:panels="clr-namespace:Avalonia.Labs.Panels;assembly=Avalonia.Labs.Panels"
         xmlns:icons="clr-namespace:NexusMods.Icons;assembly=NexusMods.Icons"
-        xmlns:element="clr-namespace:NexusMods.App.UI.Controls.Spinner;assembly=NexusMods.App.UI"
         xmlns:collections="clr-namespace:NexusMods.App.UI.Pages.LibraryPage.Collections;assembly=NexusMods.App.UI">
 
     <Design.PreviewWith>
@@ -55,6 +54,7 @@
                         <Style Selector="^ Image#TileImage">
                             <Setter Property="Width" Value="144" />
                             <Setter Property="Height" Value="180" />
+                            <Setter Property="Stretch" Value="UniformToFill" />
                         </Style>
                     </Style>