DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

UI - Fixed UI showing during auto-run even with show on startup disabled

Browse Source 
UI - Fixen an issue during startup where Artemis would navigate to home after a few seconds
Workshop - Added Submit new entry button to submissions tab
This commit is contained in:
RobertBeekman 2024-02-19 21:54:53 +01:00
parent 0b6bf5685e
commit 9126601ae7
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.UI.Shared/Routing/Router/Router.cs
View File

@ -199,6 +199,8 @@ internal class Router : CorePropertyChanged, IRouter, IDisposable
{ {
if (_previousWindowRoute != null && _currentRouteSubject.Value == "blank") if (_previousWindowRoute != null && _currentRouteSubject.Value == "blank")
Dispatcher.UIThread.InvokeAsync(async () => await Navigate(_previousWindowRoute, new RouterNavigationOptions {AddToHistory = false, EnableLogging = false})); 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) private void MainWindowServiceOnMainWindowClosed(object? sender, EventArgs e)

6
src/Artemis.UI/Screens/Root/RootViewModel.cs
View File

@ -94,8 +94,6 @@ public class RootViewModel : RoutableHostScreen<RoutableScreen>, IMainWindowProv
registrationService.RegisterBuiltInDataModelDisplays(); registrationService.RegisterBuiltInDataModelDisplays();
registrationService.RegisterBuiltInDataModelInputs(); registrationService.RegisterBuiltInDataModelInputs();
registrationService.RegisterBuiltInPropertyEditors(); registrationService.RegisterBuiltInPropertyEditors();
_router.Navigate("home");
}); });
} }
@ -130,7 +128,9 @@ public class RootViewModel : RoutableHostScreen<RoutableScreen>, IMainWindowProv
bool minimized = Constants.StartupArguments.Contains("--minimized"); bool minimized = Constants.StartupArguments.Contains("--minimized");
bool showOnAutoRun = _settingsService.GetSetting("UI.ShowOnStartup", true).Value; bool showOnAutoRun = _settingsService.GetSetting("UI.ShowOnStartup", true).Value;
return (autoRunning && showOnAutoRun) || !minimized; if (autoRunning)
return showOnAutoRun;
return !minimized;
} }
private void ShowSplashScreen() private void ShowSplashScreen()

32
src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
View File

@ -36,20 +36,24 @@
<Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button> <Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
</StackPanel> </StackPanel>
<ScrollViewer IsVisible="{CompiledBinding Entries.Count}"> <StackPanel Spacing="15">
<ItemsControl ItemsSource="{CompiledBinding Entries}"> <Button HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
<ItemsControl.ItemTemplate> <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
<DataTemplate> <ItemsControl ItemsSource="{CompiledBinding Entries}">
<ContentControl Content="{CompiledBinding}"/> <ItemsControl.ItemTemplate>
</DataTemplate> <DataTemplate>
</ItemsControl.ItemTemplate> <ContentControl Content="{CompiledBinding}" />
<ItemsControl.ItemsPanel> </DataTemplate>
<ItemsPanelTemplate> </ItemsControl.ItemTemplate>
<VirtualizingStackPanel /> <ItemsControl.ItemsPanel>
</ItemsPanelTemplate> <ItemsPanelTemplate>
</ItemsControl.ItemsPanel> <VirtualizingStackPanel />
</ItemsControl> </ItemsPanelTemplate>
</ScrollViewer> </ItemsControl.ItemsPanel>
</ItemsControl>
</ScrollViewer>
</StackPanel>
</Panel> </Panel>
</Panel> </Panel>