DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-01 02:03:32 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: DarthAffe:c901bce626477bcd505ff76fef233161cdf9f004
Branches Tags
DarthAffe:master
DarthAffe:development
DarthAffe:feature/docs-in-docker
DarthAffe:feature/default-entries
DarthAffe:feature/hot-avalonia-3
DarthAffe:RGB.NET_v3
DarthAffe:feature/datamodelsegment
DarthAffe:feature/device-refactor
DarthAffe:RenderOptimizations
DarthAffe:feature/linux-ci
DarthAffe:wpf
DarthAffe:feature/ScreenCaptureNodes
DarthAffe:1.x
DarthAffe:prerelease
..
compare: DarthAffe:00c510cad3e5585277df1a1a086c647a6189a4da
Branches Tags
DarthAffe:development
DarthAffe:feature/docs-in-docker
DarthAffe:master
DarthAffe:feature/default-entries
DarthAffe:feature/hot-avalonia-3
DarthAffe:RGB.NET_v3
DarthAffe:feature/datamodelsegment
DarthAffe:feature/device-refactor
DarthAffe:RenderOptimizations
DarthAffe:feature/linux-ci
DarthAffe:wpf
DarthAffe:feature/ScreenCaptureNodes
DarthAffe:1.x
DarthAffe:prerelease

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

3 changed files with 17 additions and 23 deletions
Show Stats Expand all files Collapse all files

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

@ -199,8 +199,6 @@ internal class Router : CorePropertyChanged, IRouter, IDisposable
{
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)

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

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

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

@ -36,24 +36,20 @@
<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}">
<ItemsControl ItemsSource="{CompiledBinding Entries}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<ContentControl Content="{CompiledBinding}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
</ScrollViewer>
</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>
</Panel>
</Panel>