Merge pull request #737 from emoacht/develop

Develop

Author: emoacht

Source/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 </Project>

Source/Installer/Product.wxs

@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
      xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
-  <Package Name="Monitorian" Manufacturer="emoacht" Version="4.13.3"
+  <Package Name="Monitorian" Manufacturer="emoacht" Version="4.14.0"
            Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
     <SummaryInformation Description="Installer for Monitorian"/>
 
@@ -113,6 +113,12 @@
           <File Id="CoreResourcesLibrary_es" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
         </Component>
       </Directory>
+      <Directory Id="ResourcesFolder_faIR" Name="fa-IR"
+                 FileSource="$(var.Monitorian.TargetDir)fa-IR">
+        <Component Id="CoreResourcesLibrary_faIR" Guid="{40146807-5D83-4620-A167-544C0C85CBE7}">
+          <File Id="CoreResourcesLibrary_faIR" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
+        </Component>
+      </Directory>
       <Directory Id="ResourcesFolder_fr" Name="fr"
                  FileSource="$(var.Monitorian.TargetDir)fr">
         <Component Id="CoreResourcesLibrary_fr" Guid="{B7502D66-6FE8-4E0F-A8D0-42AFFBE82895}">
@@ -250,6 +256,7 @@
       <ComponentRef Id="CoreResourcesLibrary_de"/>
       <ComponentRef Id="CoreResourcesLibrary_elGR"/>
       <ComponentRef Id="CoreResourcesLibrary_es"/>
+      <ComponentRef Id="CoreResourcesLibrary_faIR"/>
       <ComponentRef Id="CoreResourcesLibrary_fr"/>
       <ComponentRef Id="CoreResourcesLibrary_it"/>
       <ComponentRef Id="CoreResourcesLibrary_jaJP"/>

Source/Monitorian.Core/AppControllerCore.cs

@@ -31,8 +31,8 @@ public class AppControllerCore
 	public ObservableCollection<MonitorViewModel> Monitors { get; }
 	protected readonly object _monitorsLock = new();
 
-	public NotifyIconContainer NotifyIconContainer { get; }
 	public WindowPainter WindowPainter { get; }
+	public NotifyIconContainer NotifyIconContainer { get; }
 
 	private readonly SessionWatcher _sessionWatcher;
 	private readonly PowerWatcher _powerWatcher;
@@ -51,8 +51,8 @@ public AppControllerCore(AppKeeper keeper, SettingsCore settings)
 		Monitors = new ObservableCollection<MonitorViewModel>();
 		BindingOperations.EnableCollectionSynchronization(Monitors, _monitorsLock);
 
-		NotifyIconContainer = new NotifyIconContainer();
 		WindowPainter = new WindowPainter();
+		NotifyIconContainer = new NotifyIconContainer();		
 
 		_sessionWatcher = new SessionWatcher();
 		_powerWatcher = new PowerWatcher();
@@ -71,16 +71,21 @@ public virtual async Task InitiateAsync()
 		OnSettingsInitiated();
 		await OperationRecorder.RecordAsync($"Connectable by named pipes: {_keeper.StartupAgent.IsConnectable}");
 
+		WindowPainter.ApplyInitialTheme();
 		NotifyIconContainer.ShowIcon(WindowPainter.GetIconPath(), ProductInfo.Title);
 		WindowPainter.ThemeChanged += (_, _) =>
 		{
 			NotifyIconContainer.ShowIcon(WindowPainter.GetIconPath());
 		};
 
-		_current.MainWindow = new MainWindow(this);
+		var mainWindow = new MainWindow(this);
+		_current.MainWindow = mainWindow;
 
 		if (StartupAgent.IsWindowShowExpected())
-			_current.MainWindow.Show();
+		{
+			mainWindow.CursorLocation = CursorHelper.GetCursorLocation();
+			mainWindow.Show();
+		}
 
 		await ScanAsync();
 
@@ -167,7 +172,7 @@ protected async void OnMainWindowShowRequestedBySelf(object sender, EventArgs e)
 
 	protected async void OnMainWindowShowRequestedByOther(object sender, EventArgs e)
 	{
-		_current.Dispatcher.Invoke(() => ShowMainWindow());
+		_current.Dispatcher.Invoke(() => ShowMainWindow(true));
 		await CheckUpdateAsync();
 
 		if (_brightnessConnector.IsEnabled)
@@ -179,12 +184,13 @@ protected void OnMenuWindowShowRequested(object sender, Point e)
 		ShowMenuWindow(e);
 	}
 
-	protected virtual void ShowMainWindow()
+	protected virtual void ShowMainWindow(bool useCursorLocation = false)
 	{
 		var window = (MainWindow)_current.MainWindow;
 		if (window is { CanBeShown: false } or { Visibility: Visibility.Visible, IsForeground: true })
 			return;
 
+		window.CursorLocation = useCursorLocation ? CursorHelper.GetCursorLocation() : null;
 		window.ShowForeground();
 		window.Activate();
 	}
@@ -497,8 +503,9 @@ protected virtual async Task UpdateMessageAsync(string deviceInstanceId, string
 
 	private void ReflectMouseWheel(int delta)
 	{
-		var monitor = Monitors.Prepend(SelectedMonitor)
-			.FirstOrDefault(x => x.IsTarget && x.IsControllable);
+		var monitors = Monitors.Where(x => x.IsTarget && x.IsControllable).ToArray();
+		var monitor = monitors.FirstOrDefault(x => ReferenceEquals(x, SelectedMonitor))
+			?? monitors.FirstOrDefault(); // Fallback
 		if (monitor is null)
 			return;
 

Source/Monitorian.Core/Models/LanguageService.cs

@@ -37,20 +37,25 @@ public class LanguageService
 	public static IReadOnlyDictionary<string, string> ResourceDictionary => _resourceDictionary.Value;
 	private static readonly Lazy<Dictionary<string, string>> _resourceDictionary = new(() =>
 	{
-		if (_culture.Value is not null)
+		var culture = _culture.Value ?? CultureInfo.CurrentUICulture;
+
+		// Go back up culture hierarchy. 
+		while (culture != CultureInfo.InvariantCulture)
 		{
-			var resourceSet = new ResourceManager(typeof(Resources)).GetResourceSet(_culture.Value, true, false);
+			var resourceSet = new ResourceManager(typeof(Resources)).GetResourceSet(culture, true, false);
 			if (resourceSet is not null)
 			{
 				return resourceSet.Cast<DictionaryEntry>()
 					.Where(x => x.Key is string)
 					.ToDictionary(x => (string)x.Key, x => x.Value?.ToString());
 			}
+
+			culture = culture.Parent;
 		}
 		return new Dictionary<string, string>();
 	});
 
-	public static bool IsResourceRightToLeft => (_culture.Value?.TextInfo.IsRightToLeft is true);
+	public static bool IsResourceRightToLeft => ((_culture.Value ?? CultureInfo.CurrentUICulture).TextInfo.IsRightToLeft is true);
 
 	/// <summary>
 	/// Switches default and current thread's culture.

Source/Monitorian.Core/Models/Monitor/DisplayMonitorProvider.cs

@@ -115,7 +115,8 @@ public static async Task<DisplayItem[]> GetDisplayMonitorsAsync()
 			{
 				foreach (var device in devices)
 				{
-					if (!device.Properties.TryGetValue(deviceInstanceIdKey, out object value))
+					// Null check is inserted because NullReferenceException is observed in this method.
+					if ((device is null) || !device.Properties.TryGetValue(deviceInstanceIdKey, out object value))
 						continue;
 
 					var deviceInstanceId = value as string;

Source/Monitorian.Core/Models/Monitor/IMonitor.cs

@@ -38,7 +38,11 @@ public enum AccessStatus
 	None = 0,
 	Succeeded,
 	Failed,
-	DdcFailed,
+
+	DdcNotSupported,
+	DdcDataInvalid,
+	DdcMessageInvalid,
+
 	TransmissionFailed,
 	NoLongerExist,
 	NotSupported

Source/Monitorian.Core/Models/Monitor/MonitorConfiguration.cs

@@ -666,7 +666,8 @@ private static bool EnsurePhysicalMonitorHandle(SafePhysicalMonitorHandle physic
 	private static bool CheckPossibleTransientStatus(AccessStatus oldStatus, AccessStatus newStatus)
 	{
 		return (oldStatus is AccessStatus.None)
-			&& (newStatus is AccessStatus.TransmissionFailed);
+			&& (newStatus is AccessStatus.DdcMessageInvalid or
+							 AccessStatus.TransmissionFailed);
 	}
 
 	#region Error
@@ -684,11 +685,11 @@ private static AccessStatus GetStatus(int errorCode)
 	{
 		return unchecked((uint)errorCode) switch
 		{
-			ERROR_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED or
-			ERROR_GRAPHICS_DDCCI_INVALID_DATA or
+			ERROR_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED => AccessStatus.DdcNotSupported,
+			ERROR_GRAPHICS_DDCCI_INVALID_DATA => AccessStatus.DdcDataInvalid,
 			ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND or
 			ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH or
-			ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM => AccessStatus.DdcFailed,
+			ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM => AccessStatus.DdcMessageInvalid,
 			ERROR_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA => AccessStatus.TransmissionFailed,
 			ERROR_GRAPHICS_MONITOR_NO_LONGER_EXISTS => AccessStatus.NoLongerExist,
 			_ => AccessStatus.Failed

Source/Monitorian.Core/Monitorian.Core.csproj

@@ -119,6 +119,7 @@
     <Compile Include="ViewModels\ScrollWindowViewModel.cs" />
     <Compile Include="ViewModels\ViewModelBase.cs" />
     <Compile Include="Views\Behaviors\FocusElementAction.cs" />
+    <Compile Include="Views\Behaviors\FocusControlBahavior.cs" />
     <Compile Include="Views\Behaviors\FocusMenuBehavior.cs" />
     <Compile Include="Views\Behaviors\ItemBehavior.cs" />
     <Compile Include="Views\Behaviors\ItemSelectorBehavior.cs" />
@@ -204,6 +205,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.fa-IR.resx">
+      <DependentUpon>Resources.resx</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.fr.resx">
       <DependentUpon>Resources.resx</DependentUpon>
       <SubType>Designer</SubType>

Source/Monitorian.Core/Properties/AssemblyInfo.cs

@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.13.3.0")]
-[assembly: AssemblyFileVersion("4.13.3.0")]
+[assembly: AssemblyVersion("4.14.0.0")]
+[assembly: AssemblyFileVersion("4.14.0.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test