Nikita Tsukanov 2 年之前
父节点
当前提交
067df73f97

+ 1 - 1
src/Avalonia.Base/Threading/Dispatcher.Queue.cs

@@ -59,7 +59,7 @@ public partial class Dispatcher
 
         public event Action? Signaled;
         public event Action? Timer;
-        public void UpdateTimer(int? dueTimeInTicks)
+        public void UpdateTimer(int? dueTimeInMs)
         {
         }
     }

+ 8 - 8
src/Avalonia.Base/Threading/Dispatcher.Timers.cs

@@ -9,7 +9,7 @@ public partial class Dispatcher
     private List<DispatcherTimer> _timers = new();
     private long _timersVersion;
     private bool _dueTimeFound;
-    private int _dueTimeInTicks;
+    private int _dueTimeInMs;
     private bool _isOsTimerSet;
 
     internal void UpdateOSTimer()
@@ -25,9 +25,9 @@ public partial class Dispatcher
             if (!_hasShutdownFinished) // Dispatcher thread, does not technically need the lock to read
             {
                 bool oldDueTimeFound = _dueTimeFound;
-                int oldDueTimeInTicks = _dueTimeInTicks;
+                int oldDueTimeInTicks = _dueTimeInMs;
                 _dueTimeFound = false;
-                _dueTimeInTicks = 0;
+                _dueTimeInMs = 0;
 
                 if (_timers.Count > 0)
                 {
@@ -36,19 +36,19 @@ public partial class Dispatcher
                     {
                         var timer = _timers[i];
 
-                        if (!_dueTimeFound || timer.DueTimeInMs - _dueTimeInTicks < 0)
+                        if (!_dueTimeFound || timer.DueTimeInMs - _dueTimeInMs < 0)
                         {
                             _dueTimeFound = true;
-                            _dueTimeInTicks = timer.DueTimeInMs;
+                            _dueTimeInMs = timer.DueTimeInMs;
                         }
                     }
                 }
 
                 if (_dueTimeFound)
                 {
-                    if (!_isOsTimerSet || !oldDueTimeFound || (oldDueTimeInTicks != _dueTimeInTicks))
+                    if (!_isOsTimerSet || !oldDueTimeFound || (oldDueTimeInTicks != _dueTimeInMs))
                     {
-                        _impl.UpdateTimer(Math.Max(1, _dueTimeInTicks));
+                        _impl.UpdateTimer(Math.Max(1, _dueTimeInMs));
                         _isOsTimerSet = true;
                     }
                 }
@@ -111,7 +111,7 @@ public partial class Dispatcher
             {
                 if (!_hasShutdownFinished) // Could be a non-dispatcher thread, lock to read
                 {
-                    if (_dueTimeFound && _dueTimeInTicks - currentTimeInTicks <= 0)
+                    if (_dueTimeFound && _dueTimeInMs - currentTimeInTicks <= 0)
                     {
                         timers = _timers;
                         timersVersion = _timersVersion;

+ 5 - 5
src/Avalonia.Base/Threading/IDispatcherImpl.cs

@@ -12,7 +12,7 @@ public interface IDispatcherImpl
     void Signal();
     event Action Signaled;
     event Action Timer;
-    void UpdateTimer(int? dueTimeInTicks);
+    void UpdateTimer(int? dueTimeInMs);
 }
 
 
@@ -46,13 +46,13 @@ internal class LegacyDispatcherImpl : IControlledDispatcherImpl
 
     public event Action? Signaled;
     public event Action? Timer;
-    public void UpdateTimer(int? dueTimeInTicks)
+    public void UpdateTimer(int? dueTimeInMs)
     {
         _timer?.Dispose();
         _timer = null;
-        if (dueTimeInTicks.HasValue)
+        if (dueTimeInMs.HasValue)
             _timer = _platformThreading.StartTimer(DispatcherPriority.Send,
-                TimeSpan.FromMilliseconds(dueTimeInTicks.Value),
+                TimeSpan.FromMilliseconds(dueTimeInMs.Value),
                 OnTick);
     }
 
@@ -80,7 +80,7 @@ class NullDispatcherImpl : IDispatcherImpl
     public event Action? Signaled;
     public event Action? Timer;
 
-    public void UpdateTimer(int? dueTimeInTicks)
+    public void UpdateTimer(int? dueTimeInMs)
     {
         
     }

+ 3 - 3
src/Avalonia.Controls/Platform/ManagedDispatcherImpl.cs

@@ -40,13 +40,13 @@ public class ManagedDispatcherImpl : IControlledDispatcherImpl
 
     public event Action? Signaled;
     public event Action? Timer;
-    public void UpdateTimer(int? dueTimeInTicks)
+    public void UpdateTimer(int? dueTimeInMs)
     {
         lock (_lock)
         {
-            _nextTimer = dueTimeInTicks == null
+            _nextTimer = dueTimeInMs == null
                 ? null
-                : _clock.Elapsed + TimeSpan.FromMilliseconds(dueTimeInTicks.Value);
+                : _clock.Elapsed + TimeSpan.FromMilliseconds(dueTimeInMs.Value);
             if (!CurrentThreadIsLoopThread)
                 _wakeup.Set();
         }

+ 2 - 2
src/Avalonia.Native/DispatcherImpl.cs

@@ -54,9 +54,9 @@ internal class DispatcherImpl : IControlledDispatcherImpl, IDispatcherClock
 
     public void Signal() => _native.Signal();
 
-    public void UpdateTimer(int? dueTimeInTicks)
+    public void UpdateTimer(int? dueTimeInMs)
     {
-        var ms = dueTimeInTicks == null ? -1 : Math.Max(1, dueTimeInTicks.Value - TickCount);
+        var ms = dueTimeInMs == null ? -1 : Math.Max(1, dueTimeInMs.Value - TickCount);
         _native.UpdateTimer(ms);
     }
 

+ 2 - 2
src/Avalonia.X11/X11PlatformThreading.cs

@@ -227,9 +227,9 @@ namespace Avalonia.X11
         public event Action Signaled;
         public event Action Timer;
 
-        public void UpdateTimer(int? dueTimeInTicks)
+        public void UpdateTimer(int? dueTimeInMs)
         {
-            _nextTimer = dueTimeInTicks;
+            _nextTimer = dueTimeInMs;
             if (_nextTimer != null)
                 Wakeup();
         }

+ 3 - 3
src/Windows/Avalonia.Win32/Win32DispatcherImpl.cs

@@ -39,14 +39,14 @@ internal class Win32DispatcherImpl : IControlledDispatcherImpl, IDispatcherClock
 
     void TimerProc(IntPtr hWnd, uint uMsg, IntPtr nIdEvent, uint dwTime) => Timer?.Invoke();
 
-    public void UpdateTimer(int? dueTimeInTicks)
+    public void UpdateTimer(int? dueTimeInMs)
     {
         if (_timerHandle.HasValue)
             KillTimer(IntPtr.Zero, _timerHandle.Value);
-        if (dueTimeInTicks == null)
+        if (dueTimeInMs == null)
             return;
 
-        var interval = (uint)Math.Max(1, TickCount - dueTimeInTicks.Value);
+        var interval = (uint)Math.Max(1, TickCount - dueTimeInMs.Value);
 
         _timerHandle = SetTimer(
             IntPtr.Zero,