chore: Get the correct screen ID on Windows

leanflutter · Aug 18, 2024 · 27e917a · 27e917a
1 parent 47ca9a0
commit 27e917a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/packages/screen_retriever_platform_interface/lib/src/display.dart b/packages/screen_retriever_platform_interface/lib/src/display.dart
@@ -22,7 +22,7 @@ class Display {
       _$DisplayFromJson(json);
 
   /// Unique identifier associated with the display.
-  final num id;
+  final String id;
 
   /// The name of the display.
   final String? name;

diff --git a/packages/screen_retriever_platform_interface/lib/src/display.g.dart b/packages/screen_retriever_platform_interface/lib/src/display.g.dart
diff --git a/packages/screen_retriever_windows/windows/screen_retriever_windows_plugin.cpp b/packages/screen_retriever_windows/windows/screen_retriever_windows_plugin.cpp
@@ -146,7 +146,22 @@ flutter::EncodableMap MonitorToEncodableMap(HMONITOR monitor) {
 
   flutter::EncodableMap display = flutter::EncodableMap();
 
-  display[flutter::EncodableValue("id")] = flutter::EncodableValue(0);
+  display[flutter::EncodableValue("id")] = flutter::EncodableValue("");
+  DISPLAY_DEVICE displayDevice;
+  displayDevice.cb = sizeof(DISPLAY_DEVICE);
+  int deviceIndex = 0;
+  while (EnumDisplayDevices(info.szDevice, deviceIndex, &displayDevice, 0)) {
+    if (displayDevice.StateFlags & DISPLAY_DEVICE_ACTIVE &&
+        (displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) {
+      std::wstring deviceName(displayDevice.DeviceName);
+      if (deviceName.find(info.szDevice) == 0) {
+        display[flutter::EncodableValue("id")] = flutter::EncodableValue(
+            converter.to_bytes(displayDevice.DeviceID).c_str());
+      }
+    }
+    deviceIndex++;
+  }
+
   display[flutter::EncodableValue("name")] =
       flutter::EncodableValue(converter.to_bytes(display_name).c_str());
   display[flutter::EncodableValue("size")] = flutter::EncodableValue(size);