diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-16 19:48:11 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-16 19:48:11 +0300 |
commit | 30b864e6d45299d2105e7f8a6554e073d0aca6f0 (patch) | |
tree | 0744f7c7bc14995b3f952ec18344aa38fc9b1ac4 /indra/llwindow/llwindowmacosx-objc.mm | |
parent | 847afb9c653f3bb7d0729589cabacb9f4910ccf3 (diff) | |
parent | db6d4a3cb45e65d06f2e2dca54b5352694cd0a16 (diff) |
Merged in lindenlab/viewer-bear
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 c3eb9b8c8a..8fece7c5c7 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) +const CGPoint getContentViewBoundsPosition(NSWindowRef window) { return [[(LLNSWindow*)window contentView] bounds].origin; } -const CGSize & getContentViewBoundsSize(NSWindowRef window) +const CGSize getContentViewBoundsSize(NSWindowRef window) { return [[(LLNSWindow*)window contentView] bounds].size; } -const CGSize & getDeviceContentViewSize(NSWindowRef window, GLViewRef view) +const CGSize getDeviceContentViewSize(NSWindowRef window, GLViewRef view) { return [(NSOpenGLView*)view convertRectToBacking:[[(LLNSWindow*)window contentView] bounds]].size; } |