diff options
author | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
commit | 3609eabe5460023d1460664feb5de10d68457725 (patch) | |
tree | 533d03aadf36730eb59c2627cfd09e35593dd03c /indra/llwindow/llwindowmacosx-objc.mm | |
parent | 3191a5ddc9b3512b79a8505072d13583eb9012c6 (diff) | |
parent | e241670694959833feaa0e667222b337095eb683 (diff) |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.mm')
-rw-r--r-- | indra/llwindow/llwindowmacosx-objc.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm index 8fece7c5c7..f895c17643 100644 --- a/indra/llwindow/llwindowmacosx-objc.mm +++ b/indra/llwindow/llwindowmacosx-objc.mm @@ -258,17 +258,17 @@ float getDeviceUnitSize(GLViewRef view) return [(LLOpenGLView*)view convertSizeToBacking:NSMakeSize(1, 1)].width; } -const CGPoint getContentViewBoundsPosition(NSWindowRef window) +CGPoint getContentViewBoundsPosition(NSWindowRef window) { return [[(LLNSWindow*)window contentView] bounds].origin; } -const CGSize getContentViewBoundsSize(NSWindowRef window) +CGSize getContentViewBoundsSize(NSWindowRef window) { return [[(LLNSWindow*)window contentView] bounds].size; } -const CGSize getDeviceContentViewSize(NSWindowRef window, GLViewRef view) +CGSize getDeviceContentViewSize(NSWindowRef window, GLViewRef view) { return [(NSOpenGLView*)view convertRectToBacking:[[(LLNSWindow*)window contentView] bounds]].size; } |