Merge branch 'development'

Artemis-RGB · Feb 19, 2024 · c901bce · c901bce
2 parents 00c510c + 9126601
commit c901bce
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/Artemis.UI.Shared/Routing/Router/Router.cs b/src/Artemis.UI.Shared/Routing/Router/Router.cs
@@ -199,6 +199,8 @@ private void MainWindowServiceOnMainWindowOpened(object? sender, EventArgs e)
     {
         if (_previousWindowRoute != null && _currentRouteSubject.Value == "blank")
             Dispatcher.UIThread.InvokeAsync(async () => await Navigate(_previousWindowRoute, new RouterNavigationOptions {AddToHistory = false, EnableLogging = false}));
+        else if (_currentRouteSubject.Value == null || _currentRouteSubject.Value == "blank")
+            Dispatcher.UIThread.InvokeAsync(async () => await Navigate("home", new RouterNavigationOptions {AddToHistory = false, EnableLogging = true}));
     }
 
     private void MainWindowServiceOnMainWindowClosed(object? sender, EventArgs e)

diff --git a/src/Artemis.UI/Screens/Root/RootViewModel.cs b/src/Artemis.UI/Screens/Root/RootViewModel.cs
@@ -94,8 +94,6 @@ public RootViewModel(IRouter router,
             registrationService.RegisterBuiltInDataModelDisplays();
             registrationService.RegisterBuiltInDataModelInputs();
             registrationService.RegisterBuiltInPropertyEditors();
-
-            _router.Navigate("home");
         });
     }
 
@@ -130,7 +128,9 @@ private bool ShouldShowUI()
         bool minimized = Constants.StartupArguments.Contains("--minimized");
         bool showOnAutoRun = _settingsService.GetSetting("UI.ShowOnStartup", true).Value;
 
-        return (autoRunning && showOnAutoRun) || !minimized;
+        if (autoRunning)
+            return showOnAutoRun;
+        return !minimized;
     }
 
     private void ShowSplashScreen()

diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
@@ -36,20 +36,24 @@
                 <Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
             </StackPanel>
 
-            <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
-                <ItemsControl ItemsSource="{CompiledBinding Entries}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <ContentControl Content="{CompiledBinding}"/>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <VirtualizingStackPanel />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                </ItemsControl>
-            </ScrollViewer>
+            <StackPanel Spacing="15">
+                <Button HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
+                <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
+                    <ItemsControl ItemsSource="{CompiledBinding Entries}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <ContentControl Content="{CompiledBinding}" />
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <VirtualizingStackPanel />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                    </ItemsControl>
+                </ScrollViewer>
+            </StackPanel>
+
         </Panel>
     </Panel>