Browse Source

Platform: update EmscriptenApplication and Sdl2Application cursor using Module['canvas']

pull/480/head
Pablo Escobar 6 years ago
parent
commit
f24a7f3158
  1. 2
      src/Magnum/Platform/EmscriptenApplication.cpp
  2. 2
      src/Magnum/Platform/Sdl2Application.cpp

2
src/Magnum/Platform/EmscriptenApplication.cpp

@ -671,7 +671,7 @@ void EmscriptenApplication::setCursor(Cursor cursor) {
CORRADE_INTERNAL_ASSERT(UnsignedInt(cursor) < Containers::arraySize(CursorMap)); CORRADE_INTERNAL_ASSERT(UnsignedInt(cursor) < Containers::arraySize(CursorMap));
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension" #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
EM_ASM_({document.querySelector(AsciiToString($0)).style.cursor = AsciiToString($1);}, _canvasTarget.data(), CursorMap[UnsignedInt(cursor)]); EM_ASM_({Module['canvas'].style.cursor = AsciiToString($0);}, CursorMap[UnsignedInt(cursor)]);
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
} }

2
src/Magnum/Platform/Sdl2Application.cpp

@ -1072,7 +1072,7 @@ void Sdl2Application::setCursor(Cursor cursor) {
CORRADE_INTERNAL_ASSERT(UnsignedInt(cursor) < Containers::arraySize(CursorMap)); CORRADE_INTERNAL_ASSERT(UnsignedInt(cursor) < Containers::arraySize(CursorMap));
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension" #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
EM_ASM_({document.getElementById('canvas').style.cursor = AsciiToString($0);}, CursorMap[UnsignedInt(cursor)]); EM_ASM_({Module['canvas'].style.cursor = AsciiToString($0);}, CursorMap[UnsignedInt(cursor)]);
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
} }

Loading…
Cancel
Save