diff --git a/Source/Editor/Utilities/ScreenUtilities/ScreenUtilities.h b/Source/Editor/Utilities/ScreenUtilities/ScreenUtilities.h index 34d6d49da..01380e25b 100644 --- a/Source/Editor/Utilities/ScreenUtilities/ScreenUtilities.h +++ b/Source/Editor/Utilities/ScreenUtilities/ScreenUtilities.h @@ -33,11 +33,6 @@ public: /// - /// Blocks mouse input and runs a callback - /// - API_FUNCTION() static void BlockAndReadMouse(); - /// /// Called when PickColor() is finished. /// diff --git a/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesLinux.cpp b/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesLinux.cpp index 531255df0..5e0efb2f2 100644 --- a/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesLinux.cpp +++ b/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesLinux.cpp @@ -17,9 +17,10 @@ Int2 ScreenUtilities::GetScreenCursorPosition() class ScreenUtilitiesLinux { public: + static void BlockAndReadMouse(); }; -void ScreenUtilities::BlockAndReadMouse() +void ScreenUtilitiesLinux::BlockAndReadMouse() { } diff --git a/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesWindows.cpp b/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesWindows.cpp index 5bc0b17cc..e04d3fb77 100644 --- a/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesWindows.cpp +++ b/Source/Editor/Utilities/ScreenUtilities/ScreenUtilitiesWindows.cpp @@ -36,6 +36,7 @@ class ScreenUtilitiesWindows { public: static void PickSelected(); + static void BlockAndReadMouse(); }; void ScreenUtilitiesWindows::PickSelected() { @@ -76,7 +77,7 @@ LRESULT CALLBACK ScreenUtilsMouseCallback( return CallNextHookEx(NULL, nCode, wParam, lParam); } -void ScreenUtilities::BlockAndReadMouse() +void ScreenUtilitiesWindows::BlockAndReadMouse() { _mouseCallbackHook = SetWindowsHookEx(WH_MOUSE_LL, ScreenUtilsMouseCallback, NULL, NULL); if (_mouseCallbackHook == NULL) @@ -90,8 +91,7 @@ Delegate ScreenUtilities::PickColorDone; void ScreenUtilities::PickColor() { -// MCore::AttachThread(); - BlockAndReadMouse(); + ScreenUtilitiesWindows::BlockAndReadMouse(); }