[Bf-blender-cvs] [95e490889dd] blender2.8: macOS GHOST: use non-deprecated functions for coordinates
Arto Kitula
noreply at git.blender.org
Tue Aug 7 21:02:34 CEST 2018
Commit: 95e490889dda96768e69ec222b91898f13ef0c1d
Author: Arto Kitula
Date: Tue Aug 7 21:53:02 2018 +0300
Branches: blender2.8
https://developer.blender.org/rB95e490889dda96768e69ec222b91898f13ef0c1d
macOS GHOST: use non-deprecated functions for coordinates
===================================================================
M intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
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;
}
More information about the Bf-blender-cvs
mailing list