Merge branch 'development'

Artemis-RGB · Feb 28, 2024 · 1d23c69 · 1d23c69
2 parents e6565a2 + fb59443
commit 1d23c69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/Artemis.Core/Plugins/PluginInfo.cs b/src/Artemis.Core/Plugins/PluginInfo.cs
@@ -10,7 +10,7 @@ namespace Artemis.Core;
 /// </summary>
 public class PluginInfo : CorePropertyChanged, IPrerequisitesSubject
 {
-    private Version? _api;
+    private Version? _api = new(1, 0, 0);
     private string? _author;
     private bool _autoEnableFeatures = true;
     private string? _description;
@@ -38,7 +38,7 @@ internal PluginInfo()
     ///     The plugins GUID
     /// </summary>
     [JsonRequired]
-    [JsonInclude] 
+    [JsonInclude]
     public Guid Guid
     {
         get => _guid;
@@ -49,7 +49,7 @@ public Guid Guid
     ///     The name of the plugin
     /// </summary>
     [JsonRequired]
-    [JsonInclude] 
+    [JsonInclude]
     public string Name
     {
         get => _name;
@@ -91,7 +91,7 @@ public Uri? Repository
         get => _repository;
         set => SetAndNotify(ref _repository, value);
     }
-    
+
     /// <summary>
     ///     Gets or sets the help page of this plugin
     /// </summary>
@@ -100,7 +100,7 @@ public Uri? HelpPage
         get => _helpPage;
         set => SetAndNotify(ref _helpPage, value);
     }
-    
+
     /// <summary>
     ///     Gets or sets the help page of this plugin
     /// </summary>
@@ -109,7 +109,7 @@ public Uri? License
         get => _license;
         set => SetAndNotify(ref _license, value);
     }
-    
+
     /// <summary>
     ///     Gets or sets the author of this plugin
     /// </summary>
@@ -133,7 +133,7 @@ public string? Icon
     ///     The version of the plugin
     /// </summary>
     [JsonRequired]
-    [JsonInclude] 
+    [JsonInclude]
     public string Version
     {
         get => _version;
@@ -144,7 +144,7 @@ public string Version
     ///     The main entry DLL, should contain a class implementing Plugin
     /// </summary>
     [JsonRequired]
-    [JsonInclude] 
+    [JsonInclude]
     public string Main
     {
         get => _main;
@@ -164,7 +164,7 @@ public bool AutoEnableFeatures
     /// <summary>
     ///     Gets a boolean indicating whether this plugin requires elevated admin privileges
     /// </summary>
-    [JsonInclude] 
+    [JsonInclude]
     public bool RequiresAdmin
     {
         get => _requiresAdmin;
@@ -183,7 +183,7 @@ public bool HotReloadSupported
     /// <summary>
     ///     Gets
     /// </summary>
-    [JsonInclude] 
+    [JsonInclude]
     public PluginPlatform? Platforms
     {
         get => _platforms;
@@ -193,7 +193,7 @@ public PluginPlatform? Platforms
     /// <summary>
     ///     Gets the API version the plugin was built for
     /// </summary>
-    [JsonInclude] 
+    [JsonInclude]
     public Version? Api
     {
         get => _api;

diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
@@ -36,9 +36,9 @@
                 <Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
             </StackPanel>
 
-            <StackPanel Spacing="15">
-                <Button HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
-                <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
+            <Grid RowDefinitions="Auto,*">
+                <Button Grid.Row="0" Margin="0 0 0 15" HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
+                <ScrollViewer Grid.Row="1" IsVisible="{CompiledBinding Entries.Count}">
                     <ItemsControl ItemsSource="{CompiledBinding Entries}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
@@ -52,7 +52,7 @@
                         </ItemsControl.ItemsPanel>
                     </ItemsControl>
                 </ScrollViewer>
-            </StackPanel>
+            </Grid>
 
         </Panel>
     </Panel>