mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed capitalization of functions to match others

Browse Source
This commit is contained in:
NightlyFox 2018-09-24 16:25:47 -05:00
parent b9281534cc
commit 1afb09794c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common.h
View File

@ -153,8 +153,8 @@ void DrawPixel(uint32_t x, uint32_t y, color_t clr);
void DrawText(u32 font, uint32_t x, uint32_t y, color_t clr, const char* text); void DrawText(u32 font, uint32_t x, uint32_t y, color_t clr, const char* text);
void DrawTextTruncate(u32 font, uint32_t x, uint32_t y, color_t clr, const char* text, uint32_t max_width, const char* end_text); void DrawTextTruncate(u32 font, uint32_t x, uint32_t y, color_t clr, const char* text, uint32_t max_width, const char* end_text);
void GetTextDimensions(u32 font, const char* text, uint32_t* width_out, uint32_t* height_out); void GetTextDimensions(u32 font, const char* text, uint32_t* width_out, uint32_t* height_out);
uint32_t getTextXCoordinate(u32 font, uint32_t rX, const char* text, const char align); uint32_t GetTextXCoordinate(u32 font, uint32_t rX, const char* text, const char align);
uint32_t getTextYCoordinate(u32 font, uint32_t rY, const char* text, const char align); uint32_t GetTextYCoordinate(u32 font, uint32_t rY, const char* text, const char align);
bool fontInitialize(void); bool fontInitialize(void);
void fontExit(); void fontExit();

4
common/font.c
View File

@ -383,7 +383,7 @@ void fontExit()
*'t' aligned, top of text aligns with rY, *'t' aligned, top of text aligns with rY,
*you get the rest.... *you get the rest....
*/ */
uint32_t getTextYCoordinate(u32 font, uint32_t rY, const char* text, const char align){ uint32_t GetTextYCoordinate(u32 font, uint32_t rY, const char* text, const char align) {
uint32_t height_o,width; uint32_t height_o,width;
GetTextDimensions(font,text,&width,&height_o); GetTextDimensions(font,text,&width,&height_o);
uint32_t height = (uint32_t)height_o; uint32_t height = (uint32_t)height_o;
@ -408,7 +408,7 @@ uint32_t getTextYCoordinate(u32 font, uint32_t rY, const char* text, const char
*align='r','l','c' translates to (right,left,center) *align='r','l','c' translates to (right,left,center)
*'r' aligned, rX location = end of string, you get the rest... *'r' aligned, rX location = end of string, you get the rest...
*/ */
uint32_t getTextXCoordinate(u32 font, uint32_t rX, const char* text, const char align){ uint32_t GetTextXCoordinate(u32 font, uint32_t rX, const char* text, const char align) {
uint32_t height,width_o; uint32_t height,width_o;
GetTextDimensions(font,text,&width_o,&height); GetTextDimensions(font,text,&width_o,&height);
uint32_t fC = (rX-width_o); uint32_t fC = (rX-width_o);

2
common/menu.c
View File

@ -496,7 +496,7 @@ void menuLoop() {
if(active_entry != NULL) { if(active_entry != NULL) {
if (active_entry->type == ENTRY_TYPE_THEME) { if (active_entry->type == ENTRY_TYPE_THEME) {
int getX = getTextXCoordinate(interuiregular18, 1180, textGetString(StrId_Actions_Theme_Menu), 'r'); int getX = GetTextXCoordinate(interuiregular18, 1180, textGetString(StrId_Actions_Theme_Menu), 'r');
DrawText(interuiregular18, getX, 0 + 47, themeCurrent.textColor, textGetString(StrId_Actions_Theme_Menu)); DrawText(interuiregular18, getX, 0 + 47, themeCurrent.textColor, textGetString(StrId_Actions_Theme_Menu));
DrawText(fontscale7, 1280 - 126 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonAText); DrawText(fontscale7, 1280 - 126 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonAText);
DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Apply)); DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Apply));