games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

[macOS] text input handling must be done on main thread

Browse Source 
Xcode's Main Thread Checker warns about that
This commit is contained in:
Andrey Filipenkov
2022-07-27 10:58:41 +03:00
committed by Andrii Danylchenko
parent f2187f6767
commit 7150ee565a
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/gui/SDL_Extensions.cpp
View File

@@ -16,6 +16,10 @@
#include "../Graphics.h" #include "../Graphics.h"
#include "../CMT.h" #include "../CMT.h"
#ifdef VCMI_APPLE
#include <dispatch/dispatch.h>
#endif
const SDL_Color Colors::YELLOW = { 229, 215, 123, 0 }; const SDL_Color Colors::YELLOW = { 229, 215, 123, 0 };
const SDL_Color Colors::WHITE = { 255, 243, 222, 0 }; const SDL_Color Colors::WHITE = { 255, 243, 222, 0 };
const SDL_Color Colors::METALLIC_GOLD = { 173, 142, 66, 0 }; const SDL_Color Colors::METALLIC_GOLD = { 173, 142, 66, 0 };
@@ -786,19 +790,35 @@ SDL_Color CSDL_Ext::makeColor(ui8 r, ui8 g, ui8 b, ui8 a)
void CSDL_Ext::startTextInput(SDL_Rect * where) void CSDL_Ext::startTextInput(SDL_Rect * where)
{ {
#ifdef VCMI_APPLE
dispatch_async(dispatch_get_main_queue(), ^{
#endif
if (SDL_IsTextInputActive() == SDL_FALSE) if (SDL_IsTextInputActive() == SDL_FALSE)
{ {
SDL_StartTextInput(); SDL_StartTextInput();
} }
SDL_SetTextInputRect(where); SDL_SetTextInputRect(where);
#ifdef VCMI_APPLE
});
#endif
} }
void CSDL_Ext::stopTextInput() void CSDL_Ext::stopTextInput()
{ {
#ifdef VCMI_APPLE
dispatch_async(dispatch_get_main_queue(), ^{
#endif
if (SDL_IsTextInputActive() == SDL_TRUE) if (SDL_IsTextInputActive() == SDL_TRUE)
{ {
SDL_StopTextInput(); SDL_StopTextInput();
} }
#ifdef VCMI_APPLE
});
#endif
} }
STRONG_INLINE static uint32_t mapColor(SDL_Surface * surface, SDL_Color color) STRONG_INLINE static uint32_t mapColor(SDL_Surface * surface, SDL_Color color)