Improve a little restting dashboard to defaults.

BartoszCichecki · Jun 21, 2023 · a485757 · a485757
1 parent cc3318e
commit a485757
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/LenovoLegionToolkit.WPF/Pages/DashboardPage.xaml.cs b/LenovoLegionToolkit.WPF/Pages/DashboardPage.xaml.cs
@@ -41,7 +41,7 @@ private async Task RefreshAsync()
         _content.RowDefinitions.Clear();
         _content.Children.Clear();
 
-        var groups = _dashboardSettings.Store.Groups;
+        var groups = _dashboardSettings.Store.Groups ?? DashboardGroup.DefaultGroups;
 
         if (Log.Instance.IsTraceEnabled)
         {

diff --git a/LenovoLegionToolkit.WPF/Settings/DashboardSettings.cs b/LenovoLegionToolkit.WPF/Settings/DashboardSettings.cs
@@ -6,7 +6,7 @@ public class DashboardSettings : AbstractSettings<DashboardSettings.DashboardSet
 {
     public class DashboardSettingsStore
     {
-        public DashboardGroup[] Groups { get; set; } = DashboardGroup.DefaultGroups;
+        public DashboardGroup[]? Groups { get; set; }
     }
 
     protected override DashboardSettingsStore Default => new();

diff --git a/LenovoLegionToolkit.WPF/Windows/Dashboard/EditDashboardWindow.xaml.cs b/LenovoLegionToolkit.WPF/Windows/Dashboard/EditDashboardWindow.xaml.cs
@@ -22,7 +22,7 @@ public partial class EditDashboardWindow
 
     public EditDashboardWindow()
     {
-        _groups = _dashboardSettings.Store.Groups;
+        _groups = _dashboardSettings.Store.Groups ?? DashboardGroup.DefaultGroups;
 
         InitializeComponent();
 
@@ -74,9 +74,12 @@ private async void AddButton_Click(object sender, RoutedEventArgs e)
 
     private async void DefaultButton_Click(object sender, RoutedEventArgs e)
     {
-        _groups = DashboardGroup.DefaultGroups;
+        _dashboardSettings.Store.Groups = null;
+        _dashboardSettings.SynchronizeStore();
+
+        Close();
 
-        await RefreshAsync();
+        Apply?.Invoke(this, EventArgs.Empty);
     }
 
     private void ApplyButton_Click(object sender, RoutedEventArgs e)
@@ -94,10 +97,7 @@ private void ApplyButton_Click(object sender, RoutedEventArgs e)
         Apply?.Invoke(this, EventArgs.Empty);
     }
 
-    private void CancelButton_Click(object sender, RoutedEventArgs e)
-    {
-        Close();
-    }
+    private void CancelButton_Click(object sender, RoutedEventArgs e) => Close();
 
     private IEnumerable<DashboardItem> GetAllItems() =>
         _groupsStackPanel.Children