Dimensions: obtain Window as well as Screen

Author: ptmt

React/Modules/RCTUIManager.m

@@ -1471,12 +1471,18 @@ static void RCTMeasureLayout(RCTShadowView *view,
 
   // Don't use RCTScreenSize since it the interface orientation doesn't apply to it
   CGRect screenSize = [[NSScreen mainScreen] frame];
+  NSSize windowSize = [[NSApp mainWindow] frame].size;
   return @{
-    @"window": @{
+    @"screen": @{
         @"width": @(rotateBounds ? screenSize.size.height : screenSize.size.width),
         @"height": @(rotateBounds ? screenSize.size.width : screenSize.size.height),
         @"scale": @(RCTScreenScale()),
     },
+    @"window": @{
+        @"width": @(windowSize.width),
+        @"height": @(windowSize.height),
+        @"scale": @(RCTScreenScale()),
+        },
   };
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-macos",
-  "version": "0.10.0-rc5",
+  "version": "0.10.0-rc6",
   "description": "A framework for building native macOS apps using React",
   "license": "BSD-3-Clause",
   "repository": {