notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes for macOS

Browse source 
Minor fixes from merging the master (SDL1) branch:

- KMOD_META in SDL1 is KMOD_GUI in SDL2. Changed.
- loadfonts() requires additional arguments in the SDL2 branch. Added.
This commit is contained in:
Mark Kim 2022-02-19 11:47:12 -05:00
parent 7b53d1583e
commit ef70ddada6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/fonts.c
View file

@ -1045,7 +1045,7 @@ static void loadfonts(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer
homedirdir = malloc(snprintf(NULL, 0, "%s/fonts", apple_globalPreferencesPath()) + 1); homedirdir = malloc(snprintf(NULL, 0, "%s/fonts", apple_globalPreferencesPath()) + 1);
if(homedirdir) { if(homedirdir) {
sprintf(homedirdir, "%s/fonts", apple_globalPreferencesPath()); sprintf(homedirdir, "%s/fonts", apple_globalPreferencesPath());
loadfonts(screen, homedirdir); loadfonts(screen, texture, renderer, homedirdir);
free(homedirdir); free(homedirdir);
} }
#endif #endif

2
src/macos.h
View file

@ -23,7 +23,7 @@
#define __MACOS_H__ #define __MACOS_H__
#define KMOD_CTRL KMOD_META /* Anywhere Linux/Windows uses CTRL, use CMD on macOS */ #define KMOD_CTRL KMOD_GUI /* Anywhere Linux/Windows uses CTRL, use CMD on macOS */
void apple_init(void); void apple_init(void);