Merge pull request #113 from damywise/patch-10

[Windows] Fix #112: Add visibleSize and visiblePosition

Author: lijy91

lib/src/window_manager.dart

@@ -256,13 +256,15 @@ class WindowManager {
 
     num visibleWidth = primaryDisplay['size']['width'];
     num visibleHeight = primaryDisplay['size']['height'];
+    num visibleStartX = 0;
     num visibleStartY = 0;
 
     if (primaryDisplay['visibleSize'] != null) {
       visibleWidth = primaryDisplay['visibleSize']['width'];
       visibleHeight = primaryDisplay['visibleSize']['height'];
     }
     if (primaryDisplay['visiblePosition'] != null) {
+      visibleStartX = primaryDisplay['visiblePosition']['x'];
       visibleStartY = primaryDisplay['visiblePosition']['y'];
     }
     Offset position = Offset(0, 0);
@@ -271,42 +273,42 @@ class WindowManager {
       position = Offset(0, 0);
     } else if (alignment == Alignment.topCenter) {
       position = Offset(
-        (visibleWidth / 2) - (windowSize.width / 2),
+        visibleStartX + (visibleWidth / 2) - (windowSize.width / 2),
         visibleStartY + 0,
       );
     } else if (alignment == Alignment.topRight) {
       position = Offset(
-        visibleWidth - windowSize.width,
+        visibleStartX + visibleWidth - windowSize.width,
         visibleStartY + 0,
       );
     } else if (alignment == Alignment.centerLeft) {
       position = Offset(
-        0,
+        visibleStartX + 0,
         visibleStartY + ((visibleHeight / 2) - (windowSize.height / 2)),
       );
     } else if (alignment == Alignment.center) {
       position = Offset(
-        (visibleWidth / 2) - (windowSize.width / 2),
+        visibleStartX + (visibleWidth / 2) - (windowSize.width / 2),
         visibleStartY + ((visibleHeight / 2) - (windowSize.height / 2)),
       );
     } else if (alignment == Alignment.centerRight) {
       position = Offset(
-        visibleWidth - windowSize.width,
+        visibleStartX + visibleWidth - windowSize.width,
         visibleStartY + ((visibleHeight / 2) - (windowSize.height / 2)),
       );
     } else if (alignment == Alignment.bottomLeft) {
       position = Offset(
-        0,
+        visibleStartX + 0,
         visibleStartY + (visibleHeight - windowSize.height),
       );
     } else if (alignment == Alignment.bottomCenter) {
       position = Offset(
-        (visibleWidth / 2) - (windowSize.width / 2),
+        visibleStartX + (visibleWidth / 2) - (windowSize.width / 2),
         visibleStartY + (visibleHeight - windowSize.height),
       );
     } else if (alignment == Alignment.bottomRight) {
       position = Offset(
-        visibleWidth - windowSize.width,
+        visibleStartX + visibleWidth - windowSize.width,
         visibleStartY + (visibleHeight - windowSize.height),
       );
     }
@@ -321,18 +323,20 @@ class WindowManager {
 
     num visibleWidth = primaryDisplay['size']['width'];
     num visibleHeight = primaryDisplay['size']['height'];
+    num visibleStartX = 0;
     num visibleStartY = 0;
 
     if (primaryDisplay['visibleSize'] != null) {
       visibleWidth = primaryDisplay['visibleSize']['width'];
       visibleHeight = primaryDisplay['visibleSize']['height'];
     }
     if (primaryDisplay['visiblePosition'] != null) {
+      visibleStartX = primaryDisplay['visiblePosition']['x'];
       visibleStartY = primaryDisplay['visiblePosition']['y'];
     }
 
     Offset position = Offset(
-      (visibleWidth / 2) - (windowSize.width / 2),
+      visibleStartX + (visibleWidth / 2) - (windowSize.width / 2),
       visibleStartY + ((visibleHeight / 2) - (windowSize.height / 2)),
     );
 

windows/window_manager.cpp

@@ -725,12 +725,35 @@ flutter::EncodableMap WindowManager::GetPrimaryDisplay(
   double height =
       (info.rcMonitor.bottom - info.rcMonitor.top) / devicePixelRatio;
 
+  double visibleWidth =
+      (info.rcWork.right - info.rcWork.left) / devicePixelRatio;
+  double visibleHeight =
+      (info.rcWork.bottom - info.rcWork.top) / devicePixelRatio;
+
+  double x = (info.rcWork.left) / devicePixelRatio;
+  double y = (info.rcWork.top) / devicePixelRatio;
+
   flutter::EncodableMap size = flutter::EncodableMap();
+  flutter::EncodableMap visibleSize = flutter::EncodableMap();
+  flutter::EncodableMap visiblePosition = flutter::EncodableMap();
+
   size[flutter::EncodableValue("width")] = flutter::EncodableValue(width);
   size[flutter::EncodableValue("height")] = flutter::EncodableValue(height);
 
+  visibleSize[flutter::EncodableValue("width")] =
+      flutter::EncodableValue(visibleWidth);
+  visibleSize[flutter::EncodableValue("height")] =
+      flutter::EncodableValue(visibleHeight);
+
+  visiblePosition[flutter::EncodableValue("x")] = flutter::EncodableValue(x);
+  visiblePosition[flutter::EncodableValue("y")] = flutter::EncodableValue(y);
+
   flutter::EncodableMap display = flutter::EncodableMap();
   display[flutter::EncodableValue("size")] = flutter::EncodableValue(size);
+  display[flutter::EncodableValue("visibleSize")] =
+      flutter::EncodableValue(visibleSize);
+  display[flutter::EncodableValue("visiblePosition")] =
+      flutter::EncodableValue(visiblePosition);
 
   return display;
 }