sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into graphics-next

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-17 18:58:04 +02:00
parent b0b1acf497 3d8a399817
commit 26de5872eb
15 changed files with 348 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Platform/SDL2/CursorImpl.cpp
View File

@@ -24,9 +24,9 @@ namespace Nz
m_iconImage.GetWidth(),
m_iconImage.GetHeight(),
32,
32 * m_iconImage.GetWidth(),
SDL_PIXELFORMAT_BGRA8888
);
4 * m_iconImage.GetWidth(),
SDL_PIXELFORMAT_BGRA32
);
if (!m_icon)
{

12
src/Nazara/Platform/SDL2/WindowImpl.cpp
View File

@@ -16,6 +16,9 @@
#include <Nazara/Utility/Image.hpp>
#include <SDL2/SDL.h>
#include <SDL2/SDL_syswm.h>
#include <Utfcpp/utf8.h>
#include <cstdio>
#include <memory>
namespace Nz
{
@@ -485,23 +488,26 @@ namespace Nz
break;
case SDL_TEXTINPUT:
{
if (SDL_GetWindowID(window->m_handle) != event->text.windowID)
return 0;
evt.type = WindowEventType_TextEntered;
evt.text.repeated = false;
for (decltype(evt.text.character) codepoint : ToUtf32String(event->text.text))
utf8::unchecked::iterator<const char*> it(event->text.text);
do
{
evt.text.character = codepoint;
evt.text.character = *it;
window->m_parent->PushEvent(evt);
}
} while (*it++);
// prevent post switch event
evt.type = WindowEventType::WindowEventType_Max;
break;
}
case SDL_TEXTEDITING:
if (SDL_GetWindowID(window->m_handle) != event->edit.windowID)