1
0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-02 10:43:31 +00:00

Compare commits

..

No commits in common. "c901bce626477bcd505ff76fef233161cdf9f004" and "00c510cad3e5585277df1a1a086c647a6189a4da" have entirely different histories.

3 changed files with 17 additions and 23 deletions

View File

@ -199,8 +199,6 @@ 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)

View File

@ -94,6 +94,8 @@ public class RootViewModel : RoutableHostScreen<RoutableScreen>, IMainWindowProv
registrationService.RegisterBuiltInDataModelDisplays(); registrationService.RegisterBuiltInDataModelDisplays();
registrationService.RegisterBuiltInDataModelInputs(); registrationService.RegisterBuiltInDataModelInputs();
registrationService.RegisterBuiltInPropertyEditors(); registrationService.RegisterBuiltInPropertyEditors();
_router.Navigate("home");
}); });
} }
@ -128,9 +130,7 @@ 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;
if (autoRunning) return (autoRunning && showOnAutoRun) || !minimized;
return showOnAutoRun;
return !minimized;
} }
private void ShowSplashScreen() private void ShowSplashScreen()

View File

@ -36,13 +36,11 @@
<Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button> <Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
</StackPanel> </StackPanel>
<StackPanel Spacing="15">
<Button HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
<ScrollViewer IsVisible="{CompiledBinding Entries.Count}"> <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
<ItemsControl ItemsSource="{CompiledBinding Entries}"> <ItemsControl ItemsSource="{CompiledBinding Entries}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<ContentControl Content="{CompiledBinding}" /> <ContentControl Content="{CompiledBinding}"/>
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
@ -52,8 +50,6 @@
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
</StackPanel>
</Panel> </Panel>
</Panel> </Panel>