games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

fix Main Thread Checker warnings on Apple platforms

Browse Source
This commit is contained in:
Andrey Filipenkov
2023-01-21 16:07:35 +03:00
parent 919c592e67
commit 7b2540517b
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/gui/CursorHandler.cpp
View File

@@ -16,6 +16,10 @@
#include "CAnimation.h" #include "CAnimation.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
#ifdef VCMI_APPLE
#include <dispatch/dispatch.h>
#endif
std::unique_ptr<ICursor> CursorHandler::createCursor() std::unique_ptr<ICursor> CursorHandler::createCursor()
{ {
if (settings["video"]["cursor"].String() == "auto") if (settings["video"]["cursor"].String() == "auto")
@@ -401,10 +405,16 @@ CursorHardware::~CursorHardware()
void CursorHardware::setVisible(bool on) void CursorHardware::setVisible(bool on)
{ {
#ifdef VCMI_APPLE
dispatch_async(dispatch_get_main_queue(), ^{
#endif
if (on) if (on)
SDL_ShowCursor(SDL_ENABLE); SDL_ShowCursor(SDL_ENABLE);
else else
SDL_ShowCursor(SDL_DISABLE); SDL_ShowCursor(SDL_DISABLE);
#ifdef VCMI_APPLE
});
#endif
} }
void CursorHardware::setImage(std::shared_ptr<IImage> image, const Point & pivotOffset) void CursorHardware::setImage(std::shared_ptr<IImage> image, const Point & pivotOffset)
@@ -422,10 +432,16 @@ void CursorHardware::setImage(std::shared_ptr<IImage> image, const Point & pivot
logGlobal->error("Failed to set cursor! SDL says %s", SDL_GetError()); logGlobal->error("Failed to set cursor! SDL says %s", SDL_GetError());
SDL_FreeSurface(cursorSurface); SDL_FreeSurface(cursorSurface);
#ifdef VCMI_APPLE
dispatch_async(dispatch_get_main_queue(), ^{
#endif
SDL_SetCursor(cursor); SDL_SetCursor(cursor);
if (oldCursor) if (oldCursor)
SDL_FreeCursor(oldCursor); SDL_FreeCursor(oldCursor);
#ifdef VCMI_APPLE
});
#endif
} }
void CursorHardware::setCursorPosition( const Point & newPos ) void CursorHardware::setCursorPosition( const Point & newPos )