diff options
author | Arto Kitula <arto.kitula@gmail.com> | 2018-08-07 21:53:02 +0300 |
---|---|---|
committer | Arto Kitula <arto.kitula@gmail.com> | 2018-08-07 21:53:02 +0300 |
commit | 95e490889dda96768e69ec222b91898f13ef0c1d (patch) | |
tree | 43ef482aed5f8acfdaedfcef82f1cac69cc4803d /intern | |
parent | 8a035612ee8bd361bf43c8935b03822cf1208435 (diff) |
macOS GHOST: use non-deprecated functions for coordinates
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 2b986428fd3..22dc772fff0 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -865,30 +865,30 @@ void GHOST_WindowCocoa::clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST void GHOST_WindowCocoa::screenToClientIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const { - NSPoint screenCoord; - NSPoint baseCoord; + NSRect screenCoord; + NSRect baseCoord; - screenCoord.x = inX; - screenCoord.y = inY; + screenCoord.origin.x = inX; + screenCoord.origin.y = inY; - baseCoord = [m_window convertScreenToBase:screenCoord]; + baseCoord = [m_window convertRectFromScreen:screenCoord]; - outX = baseCoord.x; - outY = baseCoord.y; + outX = baseCoord.origin.x; + outY = baseCoord.origin.y; } void GHOST_WindowCocoa::clientToScreenIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const { - NSPoint screenCoord; - NSPoint baseCoord; + NSRect screenCoord; + NSRect baseCoord; - baseCoord.x = inX; - baseCoord.y = inY; + baseCoord.origin.x = inX; + baseCoord.origin.y = inY; - screenCoord = [m_window convertBaseToScreen:baseCoord]; + screenCoord = [m_window convertRectToScreen:baseCoord]; - outX = screenCoord.x; - outY = screenCoord.y; + outX = screenCoord.origin.x; + outY = screenCoord.origin.y; } |