working screens api.

src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		37A517B32159597E00FBA241 /* Screens.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37A517B22159597E00FBA241 /* Screens.mm */; };
 		37C09D8821580FE4006A6758 /* SystemDialogs.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C09D8721580FE4006A6758 /* SystemDialogs.mm */; };
 		AB00E4F72147CA920032A60A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB00E4F62147CA920032A60A /* main.mm */; };
 		AB661C1E2148230F00291242 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB661C1D2148230F00291242 /* AppKit.framework */; };
@@ -16,6 +17,7 @@
 
 /* Begin PBXFileReference section */
 		379A4506214D0F6500CC143D /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../headers; sourceTree = "<group>"; };
+		37A517B22159597E00FBA241 /* Screens.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Screens.mm; sourceTree = "<group>"; };
 		37C09D8721580FE4006A6758 /* SystemDialogs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemDialogs.mm; sourceTree = "<group>"; };
 		37C09D8A21581EF2006A6758 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
 		AB00E4F62147CA920032A60A /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
@@ -55,6 +57,7 @@
 				AB661C1F2148286E00291242 /* window.mm */,
 				37C09D8A21581EF2006A6758 /* window.h */,
 				AB00E4F62147CA920032A60A /* main.mm */,
+				37A517B22159597E00FBA241 /* Screens.mm */,
 				37C09D8721580FE4006A6758 /* SystemDialogs.mm */,
 				AB7A61F02147C815003C5833 /* Products */,
 				AB661C1C2148230E00291242 /* Frameworks */,
@@ -137,6 +140,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */,
+				37A517B32159597E00FBA241 /* Screens.mm in Sources */,
 				AB00E4F72147CA920032A60A /* main.mm in Sources */,
 				37C09D8821580FE4006A6758 /* SystemDialogs.mm in Sources */,
 				AB661C202148286E00291242 /* window.mm in Sources */,

src/Avalonia.Native.OSX/Screens.mm

@@ -0,0 +1,42 @@
+#include "common.h"
+
+class Screens : public ComSingleObject<IAvnScreens, &IID_IAvnScreens>
+{
+    public:
+    
+    virtual HRESULT GetScreenCount (int* ret)
+    {
+        *ret = (int)[NSScreen screens].count;
+        
+        return S_OK;
+    }
+    
+    virtual HRESULT GetScreen (int index, AvnScreen* ret)
+    {
+        if(index < 0 || index >= [NSScreen screens].count)
+        {
+            return E_INVALIDARG;
+        }
+        
+        auto screen = [[NSScreen screens] objectAtIndex:index];
+        
+        ret->Bounds.X = [screen frame].origin.x;
+        ret->Bounds.Y = [screen frame].origin.y;
+        ret->Bounds.Height = [screen frame].size.height;
+        ret->Bounds.Width = [screen frame].size.width;
+        
+        ret->WorkingArea.X = [screen visibleFrame].origin.x;
+        ret->WorkingArea.Y = [screen visibleFrame].origin.y;
+        ret->WorkingArea.Height = [screen visibleFrame].size.height;
+        ret->WorkingArea.Width = [screen visibleFrame].size.width;
+        
+        ret->Primary = index == 0;
+        
+        return S_OK;
+    }
+};
+
+extern IAvnScreens* CreateScreens()
+{
+    return new Screens();
+}

src/Avalonia.Native.OSX/common.h

@@ -11,6 +11,7 @@ extern IAvnPlatformThreadingInterface* CreatePlatformThreading();
 extern IAvnWindow* CreateAvnWindow(IAvnWindowEvents*events);
 extern IAvnPopup* CreateAvnPopup(IAvnWindowEvents*events);
 extern IAvnSystemDialogs* CreateSystemDialogs();
+extern IAvnScreens* CreateScreens();
 
 extern NSPoint ToNSPoint (AvnPoint p);
 extern AvnPoint ToAvnPoint (NSPoint p);

src/Avalonia.Native.OSX/main.mm

@@ -100,6 +100,12 @@ public:
         *ppv = ::CreateSystemDialogs();
         return  S_OK;
     }
+    
+     virtual HRESULT CreateScreens (IAvnScreens** ppv)
+    {
+        *ppv = ::CreateScreens ();
+        return S_OK;
+    }
 };
 
 extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative()

src/headers/avalonia-native.h

@@ -191,7 +191,7 @@ AVNCOM(IAvnSystemDialogs, 0d) : virtual IUnknown
 AVNCOM(IAvnScreens, 0e) : virtual IUnknown
 {
     virtual HRESULT GetScreenCount (int* ret) = 0;
-    virtual HRESULT GetScreen (int index, AvnScreen** ret) = 0;
+    virtual HRESULT GetScreen (int index, AvnScreen* ret) = 0;
     
 };