Get friendly name for monitors

Uses a new API introduced in Windows 10 version 1803 to get a friendly name for the monitors.
johningve · Aug 16, 2018 · bed6d81 · bed6d81
1 parent c286325
commit bed6d81
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/Source/Monitorian/Models/Monitor/DeviceContext.cs b/Source/Monitorian/Models/Monitor/DeviceContext.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Windows.Devices.Display;
 
 namespace Monitorian.Models.Monitor
 {
@@ -121,16 +122,21 @@ public class DeviceItem
 			[DataMember(Order = 3)]
 			public byte MonitorIndex { get; private set; }
 
+			[DataMember(Order = 4)]
+			public string FriendlyName { get; private set; }
+
 			public DeviceItem(
 				string deviceInstanceId,
 				string description,
 				byte displayIndex,
-				byte monitorIndex)
+				byte monitorIndex,
+				string friendlyName)
 			{
 				this.DeviceInstanceId = deviceInstanceId;
 				this.Description = description;
 				this.DisplayIndex = displayIndex;
 				this.MonitorIndex = monitorIndex;
+				this.FriendlyName = friendlyName;
 			}
 		}
 
@@ -182,11 +188,16 @@ public static IEnumerable<DeviceItem> EnumerateMonitorDevices()
 					if (!isActive)
 						continue;
 
+					var displayMonitorTask = DisplayMonitor.FromIdAsync(deviceInstanceId).AsTask();
+					displayMonitorTask.Wait();
+					var displayMonitor = displayMonitorTask.Result;
+
 					yield return new DeviceItem(
 						deviceInstanceId: deviceInstanceId,
 						description: monitor.DeviceString,
 						displayIndex: displayIndex,
-						monitorIndex: monitorIndex);
+						monitorIndex: monitorIndex,
+						friendlyName: displayMonitor.DisplayName);
 
 					monitorIndex++;
 				}

diff --git a/Source/Monitorian/Models/Monitor/MonitorManager.cs b/Source/Monitorian/Models/Monitor/MonitorManager.cs
@@ -39,7 +39,7 @@ public static IEnumerable<IMonitor> EnumerateMonitors()
 					var deviceItem = deviceItems[index];
 					yield return new DdcMonitorItem(
 						deviceInstanceId: deviceItem.DeviceInstanceId,
-						description: deviceItem.Description,
+						description: deviceItem.FriendlyName,
 						displayIndex: deviceItem.DisplayIndex,
 						monitorIndex: deviceItem.MonitorIndex,
 						handle: physicalItem.Handle,
@@ -71,7 +71,7 @@ public static IEnumerable<IMonitor> EnumerateMonitors()
 					var deviceItem = deviceItems[index];
 					yield return new WmiMonitorItem(
 						deviceInstanceId: deviceItem.DeviceInstanceId,
-						description: deviceItem.Description,
+						description: deviceItem.FriendlyName,
 						displayIndex: deviceItem.DisplayIndex,
 						monitorIndex: deviceItem.MonitorIndex,
 						brightnessLevels: desktopItem.BrightnessLevels,
@@ -88,7 +88,7 @@ public static IEnumerable<IMonitor> EnumerateMonitors()
 			{
 				yield return new InaccessibleMonitorItem(
 					deviceInstanceId: deviceItem.DeviceInstanceId,
-					description: deviceItem.Description,
+					description: deviceItem.FriendlyName,
 					displayIndex: deviceItem.DisplayIndex,
 					monitorIndex: deviceItem.MonitorIndex);
 			}

diff --git a/Source/Monitorian/Monitorian.csproj b/Source/Monitorian/Monitorian.csproj
@@ -57,6 +57,10 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5\System.Runtime.WindowsRuntime.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
@@ -68,6 +72,10 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17134.0\Windows.winmd</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />