Changeset 9852

Timestamp:

03/04/09 11:25:40 (4 years ago)

Author:

shuber

Message:

improved multi-monitor-support for GraphicsWindowCocoa?

Files:

• OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/GraphicsWindowCocoa.mm (modified) (7 diffs)

OpenSceneGraph/branches/osg-cocoa-dev/src/osgViewer/GraphicsWindowCocoa.mm

@@ -141 +141 @@
 
 
+std::ostream& operator<<(std::ostream& os, const NSRect& rect) 
+{
+        os << rect.origin.x << "/" << rect.origin.y << " " << rect.size.width << "x" << rect.size.height;
+        return os;
+}
+
 // ----------------------------------------------------------------------------------------------------------
 // Cocoa uses a coordinate system where its origin is in the bottom left corner, 
@@ -148 +154 @@
 // ----------------------------------------------------------------------------------------------------------
 
-static NSRect convertFromQuartzCoordinates(osgViewer::GraphicsWindowCocoa* win,const NSRect& rect)  
-{
-    NSRect frame = [[win->getWindow() screen] frame];
-    
+static NSRect convertFromQuartzCoordinates(const NSRect& rect)  
+{
+    NSRect frame = [[[NSScreen screens] objectAtIndex: 0] frame];
     float y = frame.size.height - rect.origin.y - rect.size.height;
-    return NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
-}
-
-static NSRect convertToQuartzCoordinates(osgViewer::GraphicsWindowCocoa* win,const NSRect& rect)
-{
-    NSRect frame = [[win->getWindow() screen] frame];
+        NSRect converted = NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
+        
+        // std::cout << "converting from Quartz " << rect << " to " << converted << " using screen rect " << frame << std::endl;
+        
+    return converted;
+}
+
+static NSRect convertToQuartzCoordinates(const NSRect& rect)
+{
+    NSRect frame = [[[NSScreen screens] objectAtIndex: 0] frame];
     
     float y = frame.size.height - (rect.origin.y + rect.size.height);
-    return NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
+        NSRect converted = NSMakeRect(rect.origin.x, y, rect.size.width, rect.size.height);
+        
+        // std::cout << "converting To Quartz   " << rect << " to " << converted << " using screen rect " << frame << std::endl;
+        
+    return converted;
 }
 
@@ -714 +727 @@
     
     // convert to quartz-coordinate-system
-    bounds = convertToQuartzCoordinates(_win, bounds);
+    bounds = convertToQuartzCoordinates(bounds);
     
     // std::cout << "windowdidmove: " << bounds.origin.x << " " << bounds.origin.y << " " << bounds.size.width << " " << bounds.size.height << std::endl;
@@ -753 +766 @@
     {
         NSRect nsrect = [_win->getWindow() frame];
-        nsrect = convertToQuartzCoordinates(_win.get(), nsrect);
+        nsrect = convertToQuartzCoordinates(nsrect);
         
         rect.origin.x = nsrect.origin.x;
@@ -823 +836 @@
             style |= NSResizableWindowMask;
     }
-    
+        
     DarwinWindowingSystemInterface* wsi = dynamic_cast<DarwinWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
     int screenLeft(0), screenTop(0);
@@ -842 +855 @@
     }
     
-    rect = convertFromQuartzCoordinates(this,  rect);
+    rect = convertFromQuartzCoordinates(rect);
     [_window setFrameOrigin: rect.origin];
          
@@ -1094 +1107 @@
    
     NSRect rect = NSMakeRect(x,y,width, height);
-    rect = convertFromQuartzCoordinates(this, rect);
+    rect = convertFromQuartzCoordinates(rect);
     
     [_window setFrame: [NSWindow frameRectForContentRect: rect styleMask: [_window styleMask]] display: YES];