Fix wizard not getting input events for mapping. Major update to overlays system. Check for updates every hour.

Author: mherbold

MarvinsAIRARefactored/App.xaml.cs

@@ -391,6 +391,15 @@ void RunStartupStep( string statusKey, Action initializeAction )
 					MainWindow.Show();
 				}
 
+				// Start the worker thread and the input polling timer before showing the modal
+				// first-run wizard. The wizard's button-mapping recorder relies on DirectInput.OnInput,
+				// which is only fired from PollDevices (driven by OnTimer). ShowDialog() runs a nested
+				// dispatcher loop, so the timer and worker keep ticking while the wizard is open.
+
+				_workerThread.Start();
+
+				_timer.Start();
+
 #if !ADMINBOXX
 
 				if ( showWindow && !DataContext.DataContext.Instance.Settings.AppWizardHasRun )
@@ -429,10 +438,6 @@ void RunStartupStep( string statusKey, Action initializeAction )
 
 #endif
 
-				_workerThread.Start();
-
-				_timer.Start();
-
 				Simulator.Start();
 
 				GC.Collect();
@@ -2955,6 +2960,7 @@ private static void WorkerThread()
 						app.Commentary.Tick( app );
 						app.Wind.Tick( app );
 						app.SeatBeltTensioner.Tick( app );
+						app.CloudService.Tick( app );
 
 						app.GripOMeterWindow?.Tick( app );
 						app.GapMonitorWindow?.Tick( app );
@@ -3142,7 +3148,7 @@ public void UpdateGripOMeterWindowVisibility()
 		{
 			var settings = DataContext.DataContext.Instance.Settings;
 
-			if ( OverlaysDraggable || ( settings.OverlaysShowGripOMeterWindow && Simulator.IsConnected && Simulator.IsOnTrack ) )
+			if ( settings.OverlaysShowGripOMeterWindow && ( OverlaysDraggable || ( Simulator.IsConnected && ( Simulator.IsOnTrack || settings.OverlaysShowWhenOffTrack ) && ( !Simulator.IsReplayPlaying || settings.OverlaysShowInReplayMode ) ) ) )
 			{
 				EnsureGripOMeterWindowExists();
 
@@ -3163,7 +3169,7 @@ public void UpdateGapMonitorWindowVisibility()
 		{
 			var settings = DataContext.DataContext.Instance.Settings;
 
-			if ( OverlaysDraggable || ( settings.OverlaysShowGapMonitorWindow && Simulator.IsConnected && Simulator.IsOnTrack ) )
+			if ( settings.OverlaysShowGapMonitorWindow && ( OverlaysDraggable || ( Simulator.IsConnected && ( Simulator.IsOnTrack || settings.OverlaysShowWhenOffTrack ) && ( !Simulator.IsReplayPlaying || settings.OverlaysShowInReplayMode ) ) ) )
 			{
 				EnsureGapMonitorWindowExists();
 
@@ -3184,7 +3190,7 @@ public void UpdateDeltaMonitorWindowVisibility()
 		{
 			var settings = DataContext.DataContext.Instance.Settings;
 
-			if ( OverlaysDraggable || ( settings.OverlaysShowDeltaMonitorWindow && Simulator.IsConnected && Simulator.IsOnTrack ) )
+			if ( settings.OverlaysShowDeltaMonitorWindow && ( OverlaysDraggable || ( Simulator.IsConnected && ( Simulator.IsOnTrack || settings.OverlaysShowWhenOffTrack ) && ( !Simulator.IsReplayPlaying || settings.OverlaysShowInReplayMode ) ) ) )
 			{
 				EnsureDeltaMonitorWindowExists();
 
@@ -3205,7 +3211,7 @@ public void UpdateSpeechToTextWindowVisibility()
 		{
 			var settings = DataContext.DataContext.Instance.Settings;
 
-			if ( OverlaysDraggable )
+			if ( OverlaysDraggable && settings.SpeechToTextEnabled )
 			{
 				EnsureSpeechToTextWindowExists();
 

MarvinsAIRARefactored/Classes/OverlayWindowMover.cs

@@ -0,0 +1,95 @@
+using System.Windows;
+using System.Windows.Input;
+
+using WinFormsCursor = System.Windows.Forms.Cursor;
+
+namespace MarvinsAIRARefactored.Classes;
+
+// Drives an overlay window's position by tracking mouse movement after the user clicks the move icon.
+// While moving, the cursor is hidden and locked to a fixed anchor so the movement range is unbounded.
+// Moving the mouse drags the window by the same amount.
+public sealed class OverlayWindowMover
+{
+	private readonly Window _window;
+	private readonly FrameworkElement _dragHandle;
+
+	private bool _isMoving = false;
+	private System.Drawing.Point _anchor;
+
+	public OverlayWindowMover( Window window, FrameworkElement dragHandle )
+	{
+		_window = window;
+		_dragHandle = dragHandle;
+	}
+
+	public bool IsMoving => _isMoving;
+
+	public void Start()
+	{
+		if ( _isMoving )
+		{
+			return;
+		}
+
+		_isMoving = true;
+
+		_anchor = WinFormsCursor.Position;
+
+		Mouse.OverrideCursor = System.Windows.Input.Cursors.None;
+
+		_window.LostMouseCapture += Window_LostMouseCapture;
+
+		_window.CaptureMouse();
+	}
+
+	public void Update()
+	{
+		if ( !_isMoving )
+		{
+			return;
+		}
+
+		var position = WinFormsCursor.Position;
+
+		var deltaX = position.X - _anchor.X;
+		var deltaY = position.Y - _anchor.Y;
+
+		if ( ( deltaX == 0 ) && ( deltaY == 0 ) )
+		{
+			return;
+		}
+
+		_window.Left += deltaX;
+		_window.Top += deltaY;
+
+		// recenter the hidden cursor so the user can keep moving in the same direction indefinitely
+		WinFormsCursor.Position = _anchor;
+	}
+
+	public void Stop()
+	{
+		if ( !_isMoving )
+		{
+			return;
+		}
+
+		_isMoving = false;
+
+		// place the cursor at the center of the drag handle's new on-screen location so it reappears under the button the user was holding,
+		// instead of back at the anchor point where the drag started
+		var center = _dragHandle.PointToScreen( new System.Windows.Point( _dragHandle.ActualWidth / 2, _dragHandle.ActualHeight / 2 ) );
+
+		WinFormsCursor.Position = new System.Drawing.Point( (int) center.X, (int) center.Y );
+
+		_window.LostMouseCapture -= Window_LostMouseCapture;
+
+		_window.ReleaseMouseCapture();
+
+		Mouse.OverrideCursor = null;
+	}
+
+	private void Window_LostMouseCapture( object sender, System.Windows.Input.MouseEventArgs e )
+	{
+		Stop();
+	}
+}

MarvinsAIRARefactored/Classes/OverlayWindowScaler.cs

@@ -14,15 +14,17 @@ public sealed class OverlayWindowScaler
 	private const float Sensitivity = 0.0015f;
 
 	private readonly Window _window;
+	private readonly FrameworkElement _scaleHandle;
 	private readonly Func<float> _getScale;
 	private readonly Action<float> _setScale;
 
 	private bool _isScaling = false;
 	private System.Drawing.Point _anchor;
 
-	public OverlayWindowScaler( Window window, Func<float> getScale, Action<float> setScale )
+	public OverlayWindowScaler( Window window, FrameworkElement scaleHandle, Func<float> getScale, Action<float> setScale )
 	{
 		_window = window;
+		_scaleHandle = scaleHandle;
 		_getScale = getScale;
 		_setScale = setScale;
 	}
@@ -80,6 +82,12 @@ public void Stop()
 
 		_isScaling = false;
 
+		// place the cursor at the center of the scale handle's new on-screen location so it reappears under the button the user was holding,
+		// instead of back at the anchor point where scaling started
+		var center = _scaleHandle.PointToScreen( new System.Windows.Point( _scaleHandle.ActualWidth / 2, _scaleHandle.ActualHeight / 2 ) );
+
+		WinFormsCursor.Position = new System.Drawing.Point( (int) center.X, (int) center.Y );
+
 		_window.LostMouseCapture -= Window_LostMouseCapture;
 
 		_window.ReleaseMouseCapture();

MarvinsAIRARefactored/Components/CloudService.cs

@@ -17,12 +17,21 @@ public class CloudService
 	public bool CheckingForUpdate { get; private set; } = false;
 	public bool DownloadingUpdate { get; private set; } = false;
 
+	private static readonly TimeSpan UpdateCheckInterval = TimeSpan.FromHours( 1 );
+
+	private DateTime _nextUpdateCheckUtc = DateTime.MaxValue;
+
 	public void Initialize()
 	{
 		var app = App.Instance!;
 
 		app.Logger.WriteLine( "[CloudService] Initialize >>>" );
 
+		// Schedule the first recurring update check one interval from now. The initial
+		// (startup) check is fired separately from App_Startup; this keeps users who never
+		// restart the app current by re-checking periodically while iRacing is not running.
+		_nextUpdateCheckUtc = DateTime.UtcNow + UpdateCheckInterval;
+
 		var networkInterfaceList = NetworkInterface.GetAllNetworkInterfaces();
 
 		var networkInterface = networkInterfaceList.FirstOrDefault();
@@ -40,6 +49,34 @@ public void Initialize()
 		app.Logger.WriteLine( "[CloudService] <<< Initialize" );
 	}
 
+	public void Tick( App app )
+	{
+		if ( !DataContext.DataContext.Instance.Settings.AppCheckForUpdates )
+		{
+			return;
+		}
+
+		// Never check for updates while the iRacing simulator is running.
+		if ( app.Simulator.IsConnected )
+		{
+			return;
+		}
+
+		if ( CheckingForUpdate || DownloadingUpdate )
+		{
+			return;
+		}
+
+		if ( DateTime.UtcNow < _nextUpdateCheckUtc )
+		{
+			return;
+		}
+
+		_nextUpdateCheckUtc = DateTime.UtcNow + UpdateCheckInterval;
+
+		_ = CheckForUpdates( false );
+	}
+
 	class GetCurrentVersionResponse
 	{
 		public string currentVersion = string.Empty;

MarvinsAIRARefactored/Components/Simulator.cs

@@ -1097,7 +1097,7 @@ private void OnTelemetryData()
 
 		// update visibility of overlays
 
-		if ( IsOnTrack != WasOnTrack )
+		if ( ( IsOnTrack != WasOnTrack ) || ( IsReplayPlaying != _isReplayPlayingLastFrame ) )
 		{
 			app.UpdateGripOMeterWindowVisibility();
 			app.UpdateGapMonitorWindowVisibility();

MarvinsAIRARefactored/Controls/MairaMappableButton.cs

@@ -1,4 +1,5 @@
 
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
 
@@ -10,12 +11,28 @@ namespace MarvinsAIRARefactored.Controls;
 
 public class MairaMappableButton : MairaButton
 {
+	private static readonly ConditionalWeakTable<MairaMappableButton, object?> _instances = new();
+
 	public MairaMappableButton()
 	{
 		Loaded += MairaMappableButton_Loaded;
 
 		TextBlock.PreviewMouseRightButtonDown += MappableMairaButton_Label_PreviewMouseRightButtonDown;
 		Button.PreviewMouseRightButtonDown += MappableMairaButton_Button_PreviewMouseRightButtonDown;
+
+		_instances.Add( this, null );
+	}
+
+	// Re-evaluates the mapped (orange border) state for every mappable button in the app. The
+	// per-button IsMapped state is only computed on Loaded and after the button's own right-click
+	// mapping flow, so when mappings are changed elsewhere (e.g. the first-run wizard mutating the
+	// same ButtonMappings objects) the already-loaded buttons would otherwise stay stale.
+	public static void RefreshAll()
+	{
+		foreach ( var instance in _instances )
+		{
+			instance.Key.IsMapped = instance.Key.HasAnyMappedButton();
+		}
 	}
 
 	#region User Control Events

MarvinsAIRARefactored/Converters/ColorAndOpacityToBrushConverter.cs

@@ -0,0 +1,51 @@
+using System.Globalization;
+using System.Windows.Data;
+
+using Color = System.Windows.Media.Color;
+using Colors = System.Windows.Media.Colors;
+using ColorConverter = System.Windows.Media.ColorConverter;
+using SolidColorBrush = System.Windows.Media.SolidColorBrush;
+
+namespace MarvinsAIRARefactored.Converters;
+
+// Combines a background color (hex string like "#RRGGBB") and an opacity (0..1 float) into a SolidColorBrush.
+// The opacity is applied as the brush alpha channel only, so overlay text/borders painted with other brushes stay fully opaque.
+public class ColorAndOpacityToBrushConverter : IMultiValueConverter
+{
+	public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+	{
+		var color = Colors.Black;
+
+		if ( ( values.Length > 0 ) && ( values[ 0 ] is string hexColor ) && !string.IsNullOrWhiteSpace( hexColor ) )
+		{
+			try
+			{
+				color = (Color) ColorConverter.ConvertFromString( hexColor );
+			}
+			catch
+			{
+				color = Colors.Black;
+			}
+		}
+
+		var opacity = 1f;
+
+		if ( ( values.Length > 1 ) && ( values[ 1 ] is float opacityValue ) )
+		{
+			opacity = Math.Clamp( opacityValue, 0f, 1f );
+		}
+
+		color.A = (byte) Math.Round( opacity * 255f );
+
+		var brush = new SolidColorBrush( color );
+
+		brush.Freeze();
+
+		return brush;
+	}
+
+	public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+	{
+		throw new NotSupportedException();
+	}
+}