From a170a9980fd2c9b593aab30bdd0534e0567b1806 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 11 Mar 2021 23:39:26 +0100 Subject: [PATCH 1/3] UI - Fixed splash screen auto-run behaviour, closes #539 --- src/Artemis.UI/Screens/TrayViewModel.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Artemis.UI/Screens/TrayViewModel.cs b/src/Artemis.UI/Screens/TrayViewModel.cs index c17ab70ae..112c163b3 100644 --- a/src/Artemis.UI/Screens/TrayViewModel.cs +++ b/src/Artemis.UI/Screens/TrayViewModel.cs @@ -50,15 +50,14 @@ namespace Artemis.UI.Screens messageService.ConfigureNotificationProvider(this); bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun"); bool showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value; - if (!autoRunning || showOnAutoRun) + + if (autoRunning && !showOnAutoRun) + coreService.Initialized += (_, _) => updateService.AutoUpdate(); + else { ShowSplashScreen(); coreService.Initialized += (_, _) => TrayBringToForeground(); } - else - { - coreService.Initialized += (_, _) => updateService.AutoUpdate(); - } } public void TrayBringToForeground() From a57612adb7a2fb0637b11fa99ede6e75713a082f Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 14 Mar 2021 10:35:56 +0100 Subject: [PATCH 2/3] Data model debugger - Improve performance on large data models Data model debugger - Fixed list item remaining that should be removed UI - Added --minimized command line parameter to start Artemis in tray --- .../Shared/DataModelListViewModel.cs | 2 +- .../Screens/Settings/Debug/Tabs/DataModelDebugView.xaml | 7 ++++++- src/Artemis.UI/Screens/TrayViewModel.cs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs index 22eeb33a1..c36d7129e 100644 --- a/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs +++ b/src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs @@ -116,7 +116,7 @@ namespace Artemis.UI.Shared index++; } - ListCount = index + 1; + ListCount = index; while (ListChildren.Count > ListCount) ListChildren.RemoveAt(ListChildren.Count - 1); diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml index 729c67a9a..f2c0b8995 100644 --- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml +++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml @@ -66,11 +66,16 @@ - + + diff --git a/src/Artemis.UI/Screens/TrayViewModel.cs b/src/Artemis.UI/Screens/TrayViewModel.cs index 112c163b3..c755054af 100644 --- a/src/Artemis.UI/Screens/TrayViewModel.cs +++ b/src/Artemis.UI/Screens/TrayViewModel.cs @@ -49,9 +49,10 @@ namespace Artemis.UI.Screens windowService.ConfigureMainWindowProvider(this); messageService.ConfigureNotificationProvider(this); bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun"); + bool minimized = Bootstrapper.StartupArguments.Contains("--minimized"); bool showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value; - if (autoRunning && !showOnAutoRun) + if (autoRunning && !showOnAutoRun || minimized) coreService.Initialized += (_, _) => updateService.AutoUpdate(); else { From dddfca2b09c30dbcb085d2797397acacee7f6f3c Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 14 Mar 2021 22:23:25 +0100 Subject: [PATCH 3/3] Gradient editor - Delete stops with DEL key Surface editor - Fixed editor taking focus on mouse over --- .../Screens/GradientEditor/GradientEditorView.xaml | 3 +++ src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml b/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml index 74871b8ed..49af71b72 100644 --- a/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml +++ b/src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml @@ -39,6 +39,9 @@ + + + diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs index 917024ec6..306928fee 100644 --- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs +++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs @@ -281,7 +281,6 @@ namespace Artemis.UI.Screens.SurfaceEditor // ReSharper disable once UnusedMember.Global - Called from view public void EditorGridMouseMove(object sender, MouseEventArgs e) { - ((Grid) sender).Focus(); // If holding down Ctrl, pan instead of move/select if (IsPanKeyDown()) {