snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-21 06:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ZakatTeamI2P/mkxp-sunshine

Browse source
This commit is contained in:
ZakatTeamI2P 2026-03-31 02:29:27 +04:00
commit c9af737845
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/eventthread.cpp
View file

@ -352,9 +352,9 @@ void EventThread::process(RGSSThreadData &rtData)
}
if (rtData.acceptingTextInput) {
if (event.key.sym == SDLK_BACKSPACE && rtData.inputText.length() > 0)
if (event.key.key == SDLK_BACKSPACE && rtData.inputText.length() > 0)
rtData.inputText.pop_back();
else if (event.key.sym == SDLK_RETURN)
else if (event.key.key == SDLK_RETURN)
rtData.acceptingTextInput.clear();
break;

4
src/eventthread.h
View file

@ -37,8 +37,10 @@
#include <stdint.h>
#include <alc.h>
//typedef struct ALCdevice_struct ALCdevice;
struct RGSSThreadData;
typedef struct ALCdevice_struct ALCdevice;
struct SDL_Window;
union SDL_Event;

6
src/settingsmenu.cpp
View file

@ -400,7 +400,7 @@ struct SettingsMenuPrivate
}
void fillSurface(SDL_Surface *surf, uint8_t grey){
SDL_FillSurfaceRect(surf, 0, SDL_MapRGBA(rgb, grey, grey, grey, 255));
SDL_FillSurfaceRect(surf, 0, SDL_MapSurfaceRGBA(surf, grey, grey, grey, 255));
}
void fillRect(SDL_Surface *surf,
@ -408,7 +408,7 @@ struct SettingsMenuPrivate
uint8_t r, uint8_t g, uint8_t b)
{
SDL_Rect rect = { drawOff.x+x, drawOff.y+y, w, h };
SDL_FillSurfaceRect(surf, &rect, SDL_MapRGB(rgb, r, g, b));
SDL_FillSurfaceRect(surf, &rect, SDL_MapSurfaceRGB(surf, r, g, b));
}
void fillRect(SDL_Surface *surf, uint8_t grey,
@ -1077,7 +1077,7 @@ SettingsMenu::SettingsMenu(RGSSThreadData &rtData)
p->font = shState->fontState().getFont(getFontName(), getFontSize());
p->rgb = p->winSurf->format;
*p->rgb = p->winSurf->format;
const size_t layoutW = 2;
const size_t layoutH = 6;