ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: Fix some types

This commit is contained in:
Jeffrey Pfau 2015-08-26 20:11:51 -07:00
parent af24a98de4
commit 797441c379
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/3ds/gui-font.c
View File

@ -35,7 +35,7 @@ void GUIFontDestroy(struct GUIFont* font) {
free(font); free(font);
} }
int GUIFontHeight(const struct GUIFont* font) { unsigned GUIFontHeight(const struct GUIFont* font) {
UNUSED(font); UNUSED(font);
return GLYPH_HEIGHT; return GLYPH_HEIGHT;
} }

2
src/platform/psp2/gui-font.c
View File

@ -31,7 +31,7 @@ void GUIFontDestroy(struct GUIFont* font) {
free(font); free(font);
} }
int GUIFontHeight(const struct GUIFont* font) { unsigned GUIFontHeight(const struct GUIFont* font) {
UNUSED(font); UNUSED(font);
return GLYPH_HEIGHT; return GLYPH_HEIGHT;
} }

2
src/platform/wii/gui-font.c
View File

@ -39,7 +39,7 @@ void GUIFontDestroy(struct GUIFont* font) {
free(font); free(font);
} }
int GUIFontHeight(const struct GUIFont* font) { unsigned GUIFontHeight(const struct GUIFont* font) {
UNUSED(font); UNUSED(font);
return GLYPH_HEIGHT; return GLYPH_HEIGHT;
} }

4
src/util/gui.h
View File

@ -25,8 +25,8 @@ enum GUIInput {
}; };
struct GUIParams { struct GUIParams {
int width; unsigned width;
int height; unsigned height;
const struct GUIFont* font; const struct GUIFont* font;
void (*drawStart)(void); void (*drawStart)(void);

2
src/util/gui/file-select.c
View File

@ -168,7 +168,7 @@ bool selectFile(const struct GUIParams* params, const char* basePath, char* outP
} }
params->drawStart(); params->drawStart();
int y = GUIFontHeight(params->font); unsigned y = GUIFontHeight(params->font);
GUIFontPrintf(params->font, 0, y, GUI_TEXT_LEFT, 0xFFFFFFFF, "%s", currentPath); GUIFontPrintf(params->font, 0, y, GUI_TEXT_LEFT, 0xFFFFFFFF, "%s", currentPath);
y += 2 * GUIFontHeight(params->font); y += 2 * GUIFontHeight(params->font);
size_t i; size_t i;

2
src/util/gui/font.h
View File

@ -29,7 +29,7 @@ struct GUIFontGlyphMetric {
} padding; } padding;
}; };
int GUIFontHeight(const struct GUIFont*); unsigned GUIFontHeight(const struct GUIFont*);
void GUIFontPrintf(const struct GUIFont*, int x, int y, enum GUITextAlignment, uint32_t color, const char* text, ...); void GUIFontPrintf(const struct GUIFont*, int x, int y, enum GUITextAlignment, uint32_t color, const char* text, ...);