minor ui fixes

Neptune/Neptune.csproj

@@ -4,6 +4,9 @@
         <TargetFramework>net6.0</TargetFramework>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
+        
+        <!-- Fody handles unused PropertyChanged -->
+        <NoWarn>CS0067</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -16,7 +19,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.18" />
-        <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
+        <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
         <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
     </ItemGroup>
 

Neptune/Resources/Styles/BaseAppStyle.axaml

@@ -17,6 +17,9 @@
         <SolidColorBrush x:Key="NeptuneHoveredItemBackgroundBrush"
                          Color="#484848" />
         
+        <SolidColorBrush x:Key="NeptuneMediumBackgroundBrush"
+                         Color="#383838" />
+        
         <SolidColorBrush x:Key="NeptuneBackgroundBrush"
                          Color="#282828" />
         
@@ -48,7 +51,9 @@
     
     <StyleInclude Source="avares://Neptune/Resources/Definitions/ImageDefinitions.axaml" />
     
+    <StyleInclude Source="avares://Neptune/Resources/Styles/Controls/MenuItem.axaml" />
+    <StyleInclude Source="avares://Neptune/Resources/Styles/Controls/PanelContainer.axaml" />
+    
     <StyleInclude Source="avares://Neptune/Resources/Styles/Controls/ProjectExplorer/ListBox.axaml" />
     <StyleInclude Source="avares://Neptune/Resources/Styles/Controls/ProjectExplorer/ListBoxItem.axaml" />
-    <StyleInclude Source="avares://Neptune/Resources/Styles/Controls/MenuItem.axaml" />
 </Styles>

Neptune/Resources/Styles/Controls/PanelContainer.axaml

@@ -0,0 +1,25 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <Style Selector="HeaderedContentControl.PanelContainer">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="HeaderedContentControl">
+                    <Grid RowDefinitions="Auto,*">
+                        <Border Grid.Row="0"
+                                BorderThickness="0,0,0,0"
+                                BorderBrush="{StaticResource NeptuneDarkBorderBrush}">
+                            <ContentPresenter Grid.Row="0"
+                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                              Content="{TemplateBinding Header}" />
+                        </Border>
+
+                        <ContentPresenter Grid.Row="1"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          Content="{TemplateBinding Content}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</Styles>

Neptune/View/Controls/EditorHost.axaml

@@ -8,23 +8,37 @@
              x:Class="Neptune.View.Controls.EditorHost"
              DataContext="{mvvm:DataContextSource vm:EditorHostViewModel}">
     <Grid>
-        <ContentPresenter HorizontalAlignment="Stretch"
-                          VerticalAlignment="Stretch"
-                          HorizontalContentAlignment="Stretch"
-                          VerticalContentAlignment="Stretch"
-                          Background="{StaticResource NeptuneDarkBackgroundBrush}"
-                          Content="{Binding $parent[controls:EditorHost].DataContext.CurrentConfigEditor}"
-                          IsVisible="{Binding $parent[controls:EditorHost].DataContext.IsEditorAvailable}">
-            <ContentPresenter.DataTemplates>
-                <DataTemplate DataType="vme:XteaKeysEditorViewModel">
-                    <editors:XteaKeysEditor />
-                </DataTemplate>
+        <HeaderedContentControl Classes="PanelContainer"
+                                IsVisible="{Binding IsEditorAvailable}">
+            <HeaderedContentControl.Header>
+                <Grid ColumnDefinitions="Auto,Auto">
+                    <TextBlock Grid.Column="0"
+                               Margin="6"
+                               Text="{Binding SelectedConfigMember.FriendlyName}"
+                               FontSize="15" />
 
-                <DataTemplate DataType="{x:Null}">
+                    <TextBlock Grid.Column="1"
+                               Margin="0,6,6,6"
+                               Text="{Binding SelectedConfigMember.JsonFilePath}" 
+                               FontSize="15" 
+                               Opacity="0.5" />
+                </Grid>
+            </HeaderedContentControl.Header>
 
-                </DataTemplate>
-            </ContentPresenter.DataTemplates>
-        </ContentPresenter>
+            <ContentPresenter Margin="0,2,2,2"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch"
+                              HorizontalContentAlignment="Stretch"
+                              VerticalContentAlignment="Stretch"
+                              Background="{StaticResource NeptuneDarkBackgroundBrush}"
+                              Content="{Binding $parent[controls:EditorHost].DataContext.CurrentConfigEditor}">
+                <ContentPresenter.DataTemplates>
+                    <DataTemplate DataType="vme:XteaKeysEditorViewModel">
+                        <editors:XteaKeysEditor />
+                    </DataTemplate>
+                </ContentPresenter.DataTemplates>
+            </ContentPresenter>
+        </HeaderedContentControl>
 
         <Grid ColumnDefinitions="Auto,Auto,Auto"
               RowDefinitions="Auto,Auto"

Neptune/View/Controls/Editors/XteaKeysEditor.axaml

@@ -1,6 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Neptune.View.Controls.Editors.XteaKeysEditor">
+             x:Class="Neptune.View.Controls.Editors.XteaKeysEditor"
+             Background="HotPink">
     <StackPanel VerticalAlignment="Center">
         <TextBlock HorizontalAlignment="Center"
                    FontSize="16"

Neptune/View/Windows/MainWindow.axaml

@@ -53,24 +53,24 @@
             </MenuItem>
 
             <MenuItem Header="_Edit">
-                <MenuItem Header="_Preferences" 
+                <MenuItem Header="_Preferences"
                           Command="{Binding OpenSettingsWindow}"
                           Icon="{StaticResource NeptuneIconWrench_16}"
                           InputGesture="Ctrl+K"
                           HotKey="Ctrl+K" />
             </MenuItem>
-            
+
             <MenuItem Header="View" />
 
             <MenuItem Header="_Help">
-                <MenuItem Header="_Documentation" 
-                          Command="{Binding OpenDocumentation}" 
+                <MenuItem Header="_Documentation"
+                          Command="{Binding OpenDocumentation}"
                           Icon="{StaticResource NeptuneIconHelp_16}"
                           InputGesture="Ctrl+F12"
                           HotKey="Ctrl+F12" />
-                
-                <MenuItem Header="Report a _bug" 
-                          Command="{Binding OpenIssuesPage}" 
+
+                <MenuItem Header="Report a _bug"
+                          Command="{Binding OpenIssuesPage}"
                           Icon="{StaticResource NeptuneIconBug_16}"
                           InputGesture="Ctrl+F11"
                           HotKey="Ctrl+F11" />
@@ -96,7 +96,15 @@
             <Grid Grid.Column="0"
                   HorizontalAlignment="Stretch"
                   IsVisible="{Binding IsProjectLoaded}">
-                <controls:ProjectExplorer />
+                <HeaderedContentControl Classes="PanelContainer">
+                    <HeaderedContentControl.Header>
+                        <TextBlock Text="Project Explorer" 
+                                   Margin="6"
+                                   FontSize="14" />
+                    </HeaderedContentControl.Header>
+                    
+                    <controls:ProjectExplorer />
+                </HeaderedContentControl>
             </Grid>
 
             <GridSplitter Grid.Column="1"

Neptune/ViewModel/Controls/Editors/Base/EditorViewModelBase.cs

@@ -22,6 +22,7 @@ namespace Neptune.ViewModel.Controls.Editors.Base
 
         public virtual void OnDeactivated()
         {
+            ConfigMember = null;
         }
     }
 }