Merge branch 'main' of https://github.com/Michael-Kowata/NexusMods.App

Nexus-Mods · Dec 4, 2024 · a0a76a0 · a0a76a0
2 parents fb5b69a + b087ff7
commit a0a76a0
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 90 deletions.
diff --git a/src/NexusMods.App.UI/Pages/Sorting/LoadOrder/LoadOrderView.axaml b/src/NexusMods.App.UI/Pages/Sorting/LoadOrder/LoadOrderView.axaml
@@ -59,7 +59,7 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Spacing="24" Margin="24">
+            <StackPanel Grid.Row="1" Spacing="24" Margin="24,24,24,12">
                 <alerts:Alert x:Name="LoadOrderAlert"
                               Severity="Info"
                               ShowDismiss="True"

diff --git a/src/NexusMods.App.UI/Pages/Sorting/LoadOrder/LoadOrderViewDesignViewModel.cs b/src/NexusMods.App.UI/Pages/Sorting/LoadOrder/LoadOrderViewDesignViewModel.cs
@@ -68,12 +68,12 @@ public class LoadOrderTreeDataGridDesignAdapter : TreeDataGridAdapter<ILoadOrder
     protected override IObservable<IChangeSet<ILoadOrderItemModel, Guid>> GetRootsObservable(bool viewHierarchical)
     {
         var items = new ObservableCollection<ILoadOrderItemModel>([
-                new LoadOrderItemDesignModel() { DisplayName = "Item 1", Guid = Guid.NewGuid(), SortIndex = 0 },
-                new LoadOrderItemDesignModel() { DisplayName = "Item 2", Guid = Guid.NewGuid(), SortIndex = 1 },
-                new LoadOrderItemDesignModel() { DisplayName = "Item 3", Guid = Guid.NewGuid(), SortIndex = 2 },
-                new LoadOrderItemDesignModel() { DisplayName = "Item 4", Guid = Guid.NewGuid(), SortIndex = 3 },
-                new LoadOrderItemDesignModel() { DisplayName = "Item 5", Guid = Guid.NewGuid(), SortIndex = 4 },
-                new LoadOrderItemDesignModel() { DisplayName = "Item 6", Guid = Guid.NewGuid(), SortIndex = 5 },
+                new LoadOrderItemDesignModel() { DisplayName = "Item 1", Guid = Guid.NewGuid(), SortIndex = 0, IsActive = false},
+                new LoadOrderItemDesignModel() { DisplayName = "Item 2", Guid = Guid.NewGuid(), SortIndex = 1, IsActive = true },
+                new LoadOrderItemDesignModel() { DisplayName = "Item 3", Guid = Guid.NewGuid(), SortIndex = 2, IsActive = true },
+                new LoadOrderItemDesignModel() { DisplayName = "Item 4", Guid = Guid.NewGuid(), SortIndex = 3, IsActive = false },
+                new LoadOrderItemDesignModel() { DisplayName = "Item 5", Guid = Guid.NewGuid(), SortIndex = 4, IsActive = false },
+                new LoadOrderItemDesignModel() { DisplayName = "Item 6", Guid = Guid.NewGuid(), SortIndex = 5, IsActive = true },
             ]
         );
 
@@ -86,15 +86,15 @@ protected override IColumn<ILoadOrderItemModel>[] CreateColumns(bool viewHierarc
         [
             // TODO: Use <see cref="ColumnCreator"/> to create the columns using interfaces
             new HierarchicalExpanderColumn<ILoadOrderItemModel>(
-                inner: LoadOrderTreeDataGridAdapter.CreateIndexColumn("Index"),
+                inner: LoadOrderTreeDataGridAdapter.CreateIndexColumn("LOAD ORDER"),
                 childSelector: static model => model.Children,
                 hasChildrenSelector: static model => model.HasChildren.Value,
                 isExpandedSelector: static model => model.IsExpanded
             )
             {
                 Tag = "expander",
             },
-            LoadOrderTreeDataGridAdapter.CreateNameColumn("Name"),
+            LoadOrderTreeDataGridAdapter.CreateNameColumn("REDMOD NAME"),
         ];
     }
 }
diff --git a/src/NexusMods.App.UI/Pages/Sorting/SortingSelection/SortingSelectionView.axaml b/src/NexusMods.App.UI/Pages/Sorting/SortingSelection/SortingSelectionView.axaml
@@ -4,7 +4,7 @@
                                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                                 xmlns:reactiveUi="http://reactiveui.net"
                                 xmlns:sorting="clr-namespace:NexusMods.App.UI.Pages.Sorting"
-                                mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
+                                mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="700"
                                 x:Class="NexusMods.App.UI.Pages.Sorting.SortingSelectionView">
 
     <Design.DataContext>

diff --git a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/Controls/Border/Toolbar.xaml b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/Controls/Border/Toolbar.xaml
@@ -101,7 +101,7 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Height" Value="52" />
         <Setter Property="Background" Value="{StaticResource SurfaceLow}" />
-        <Setter Property="BorderThickness" Value="0, 1, 0, 1" />
+        <Setter Property="BorderThickness" Value="0, 0, 0, 1" />
         <Setter Property="BorderBrush" Value="{StaticResource StrokeTranslucentWeakBrush}" />
     </Style>
 

diff --git a/...Themes/NexusMods.Themes.NexusFluentDark/Styles/Controls/TabControl/TabControlStyles.axaml b/...Themes/NexusMods.Themes.NexusFluentDark/Styles/Controls/TabControl/TabControlStyles.axaml
@@ -158,7 +158,6 @@
             <Style Selector="^ > Border > DockPanel > ItemsPresenter#PART_ItemsPresenter">
                 <Setter Property="Margin" Value="24,12" />
             </Style>
-
 
             <Style Selector="^ TabItem">
                 <Setter Property="Padding" Value="12,0" />
@@ -233,7 +232,12 @@
                         <Setter Property="Background" Value="{StaticResource NeutralStrongBrush}" />
                     </Style>
                 </Style>
-
+            </Style>
+
+            <!-- roundabout way to bottom border tab items as no Border exists to style -->
+            <Style Selector="^ /template/ ContentPresenter#PART_SelectedContentHost">
+                <Setter Property="BorderThickness" Value="0, 1 0, 0" />
+                <Setter Property="BorderBrush" Value="{StaticResource StrokeTranslucentWeakBrush}" />
             </Style>