- remove styling/trigger/rowupdates

- initialise new observable list with no 'is visible' timers each second -.-
pjmagee · Nov 23, 2024 · 8a2b809 · 8a2b809
1 parent 6c994b1
commit 8a2b809
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 32 deletions.
diff --git a/src/Dota2Helper/Dota2Helper/ViewModels/DotaTimerViewModel.cs b/src/Dota2Helper/Dota2Helper/ViewModels/DotaTimerViewModel.cs
@@ -180,8 +180,9 @@ public void Update(TimeSpan gameTime)
 
         if (IsEnabled)
         {
-            IsStopped = CalculateIsStopped(gameTime);
             IsStarted = CalculateIsStarted(gameTime);
+            IsStopped = CalculateIsStopped(gameTime);
+
             IsVisible = CalculateIsVisible(gameTime);
 
             TimeRemaining = CalculateTimeRemaining(gameTime);
@@ -283,7 +284,7 @@ bool CalculateIsStarted(TimeSpan gameTime)
 
     bool CalculateIsVisible(TimeSpan gameTime)
     {
-        return IsEnabled && !IsStopped && IsStarted;
+        return IsEnabled && IsStarted && !IsStopped;
     }
 
     TimeSpan CalculateTimeUntilNextOccurrence(TimeSpan gameTime)

diff --git a/src/Dota2Helper/Dota2Helper/ViewModels/TimersViewModel.cs b/src/Dota2Helper/Dota2Helper/ViewModels/TimersViewModel.cs
@@ -9,6 +9,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Dota2Helper.Features.Settings;
 using Dota2Helper.Features.TimeProvider;
@@ -34,7 +35,14 @@ public ObservableCollection<DotaTimerViewModel> Timers
         set => SetProperty(ref _timers, value);
     }
 
+    public ObservableCollection<DotaTimerViewModel> VisibleTimers
+    {
+        get => _visibleTimers;
+        set => SetProperty(ref _visibleTimers, value);
+    }
+
     readonly SemaphoreSlim _semaphore = new(1, 1);
+    ObservableCollection<DotaTimerViewModel> _visibleTimers = new();
 
     public TimersViewModel(SettingsViewModel settingsViewModel, ITimeProvider timeProvider)
     {
@@ -68,24 +76,19 @@ static void CloseApplication()
 
     async void UpdateTimers(object? state)
     {
-
-
         if (await _semaphore.WaitAsync(0))
         {
             try
             {
                 Timers = _settingsViewModel.SelectedProfileViewModel.Timers;
-
                 Time = _timeProvider.Time;
 
-                Dispatcher.UIThread.Invoke(() =>
-                    {
-                        foreach (var timer in Timers)
-                        {
-                            timer.Update(Time);
-                        }
-                    }
-                );
+                foreach (var timer in Timers)
+                {
+                    timer.Update(Time);
+                }
+
+                VisibleTimers = new(Timers.Where(t => t.IsVisible));
             }
             finally
             {

diff --git a/src/Dota2Helper/Dota2Helper/Views/TimersView.axaml b/src/Dota2Helper/Dota2Helper/Views/TimersView.axaml
@@ -60,7 +60,7 @@
             CanUserResizeColumns="False"
             CanUserSortColumns="False"
             GridLinesVisibility="Horizontal"
-            ItemsSource="{Binding Timers}">
+            ItemsSource="{Binding VisibleTimers}">
             <DataGrid.Resources>
                 <!-- Could not find a way to make row not hit test while maintain button hit test -->
                 <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="Transparent" />
@@ -70,9 +70,9 @@
                 <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="Transparent" />
             </DataGrid.Resources>
             <DataGrid.Styles>
-                <Style Selector="DataGridRow">
-                    <Setter Property="IsVisible" Value="{Binding IsVisible, DataType=vm:DotaTimerViewModel}" />
-                </Style>
+                <!-- <Style Selector="DataGridRow"> -->
+                <!--     <Setter Property="IsVisible" Value="{Binding IsVisible, DataType=vm:DotaTimerViewModel}" /> -->
+                <!-- </Style> -->
                 <!-- <Style Selector="DataGridRow.visible"> -->
                 <!--     <Setter Property="IsVisible" Value="True" /> -->
                 <!-- </Style> -->

diff --git a/src/Dota2Helper/Dota2Helper/Views/TimersView.axaml.cs b/src/Dota2Helper/Dota2Helper/Views/TimersView.axaml.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
@@ -19,33 +21,57 @@ void OnItemOnPropertyChanged(object? sender, PropertyChangedEventArgs args)
     {
         try
         {
-            var item = (DotaTimerViewModel) sender!;
+            var item = (DotaTimerViewModel)sender!;
             var dataGrid = this.GetControl<DataGrid>("TimersGrid");
 
-            foreach (var descendant in dataGrid.GetVisualDescendants())
+            foreach (DataGridRow row in dataGrid.GetVisualDescendants().OfType<DataGridRow>())
             {
-                if (descendant is DataGridRow row && row.DataContext is DotaTimerViewModel dataContext)
+                if (row.DataContext is DotaTimerViewModel dataContext)
                 {
-                    Debug.WriteLine($"Row {dataContext.Name} IsVisible changed to {item.IsVisible}");
-                    row.IsVisible = item.IsVisible;
+                    if (dataContext == item)
+                    {
+                        row.IsVisible = item.IsVisible;
+                        row.Classes.Remove("visible");
+                        row.Classes.Remove("hidden");
+
+                        if (item.IsVisible)
+                        {
+                            row.Classes.Add("visible");
+                        }
+                        else
+                        {
+                            row.Classes.Add("hidden");
+                        }
+                    }
                 }
             }
         }
-        finally
+        catch (Exception e)
         {
-
+            Debug.WriteLine(e);
         }
     }
 
     void TimersGrid_OnInitialized(object? sender, EventArgs e)
     {
-        if (DataContext is TimersViewModel viewModel)
-        {
-            foreach (var item in viewModel.Timers)
-            {
-                item.PropertyChanged -= OnItemOnPropertyChanged;
-                item.PropertyChanged += OnItemOnPropertyChanged;
-            }
-        }
+        // if (DataContext is TimersViewModel viewModel)
+        // {
+        //     viewModel.Timers.CollectionChanged += (o, args) => { IsVisibleCalculation(args); };
+        //
+        //     foreach (var item in viewModel.Timers)
+        //     {
+        //         item.PropertyChanged -= OnItemOnPropertyChanged;
+        //         item.PropertyChanged += OnItemOnPropertyChanged;
+        //     }
+        // }
+    }
+
+    void IsVisibleCalculation(NotifyCollectionChangedEventArgs args)
+    {
+        // foreach (var item in args.NewItems!.OfType<DotaTimerViewModel>())
+        // {
+        //     item.PropertyChanged -= OnItemOnPropertyChanged;
+        //     item.PropertyChanged += OnItemOnPropertyChanged;
+        // }
     }
 }