ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-04 12:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #543 from VPeruS/fix-mouse-wheel

Browse source 
Fix interop for wheel events(MacOS)
This commit is contained in:
Jarl Gullberg 2017-07-05 13:43:38 +02:00 committed by GitHub
parent 4eb02d3012 fc5c7be51a
commit cc928f0e51
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/OpenTK/Platform/MacOS/Cocoa/Cocoa.cs
View file

@ -138,13 +138,17 @@ namespace OpenTK.Platform.MacOS
[DllImport(LibObjC, EntryPoint="objc_msgSend_fpret")] [DllImport(LibObjC, EntryPoint="objc_msgSend_fpret")]
extern static float SendFloat_i386(IntPtr receiver, IntPtr selector); extern static float SendFloat_i386(IntPtr receiver, IntPtr selector);
// On x64 using selector that return CGFloat give you 64 bit == double
[DllImport(LibObjC, EntryPoint="objc_msgSend")] [DllImport(LibObjC, EntryPoint="objc_msgSend")]
extern static float SendFloat_normal(IntPtr receiver, IntPtr selector); extern static double SendFloat_x64(IntPtr receiver, IntPtr selector);
[DllImport(LibObjC, EntryPoint="objc_msgSend")]
extern static float SendFloat_ios(IntPtr receiver, IntPtr selector);
public static float SendFloat(IntPtr receiver, IntPtr selector) public static float SendFloat(IntPtr receiver, IntPtr selector)
{ {
#if IOS #if IOS
return SendFloat_normal(receiver, selector); return SendFloat_ios(receiver, selector);
#else #else
if (IntPtr.Size == 4) if (IntPtr.Size == 4)
{ {
@ -152,7 +156,7 @@ namespace OpenTK.Platform.MacOS
} }
else else
{ {
return SendFloat_normal(receiver, selector); return (float)SendFloat_x64(receiver, selector);
} }
#endif #endif
} }