wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GetStringWidth renamed to GetStrWidth

This commit is contained in:
olikraus 2016-01-02 21:13:25 +01:00
parent 6e7fcd1c1f
commit 9288d95bc5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cppsrc/U8g2lib.h
View File

@ -102,7 +102,7 @@ class U8G2 : public Print
/*
uint8_t u8g2_IsGlyph(u8g2_t *u8g2, uint16_t requested_encoding);
int8_t u8g2_GetGlyphWidth(u8g2_t *u8g2, uint16_t requested_encoding);
u8g2_uint_t u8g2_GetStringWidth(u8g2_t *u8g2, const char *s);
u8g2_uint_t u8g2_GetStrWidth(u8g2_t *u8g2, const char *s);
u8g2_uint_t u8g2_GetUTF8Width(u8g2_t *u8g2, const char *str);
*/
@ -110,7 +110,7 @@ u8g2_uint_t u8g2_GetUTF8Width(u8g2_t *u8g2, const char *str);
u8g2_uint_t drawStr(u8g2_uint_t x, u8g2_uint_t y, const char *s) { return u8g2_DrawStr(&u8g2, x, y, s); }
u8g2_uint_t drawUTF8(u8g2_uint_t x, u8g2_uint_t y, const char *s) { return u8g2_DrawUTF8(&u8g2, x, y, s); }
u8g2_uint_t getStrWidth(const char *s) { return u8g2_GetStringWidth(&u8g2, s); }
u8g2_uint_t getStrWidth(const char *s) { return u8g2_GetStrWidth(&u8g2, s); }
u8g2_uint_t getUTF8Width(const char *s) { return u8g2_GetUTF8Width(&u8g2, s); }

2
csrc/u8g2.h
View File

@ -378,7 +378,7 @@ u8g2_uint_t u8g2_DrawUTF8(u8g2_t *u8g2, u8g2_uint_t x, u8g2_uint_t y, const char
#define u8g2_GetAscent(u8g2) ((u8g2)->font_info.ascent_A)
#define u8g2_GetDescent(u8g2) ((u8g2)->font_info.descent_g)
u8g2_uint_t u8g2_GetStringWidth(u8g2_t *u8g2, const char *s);
u8g2_uint_t u8g2_GetStrWidth(u8g2_t *u8g2, const char *s);
u8g2_uint_t u8g2_GetUTF8Width(u8g2_t *u8g2, const char *str);

4
csrc/u8g2_font.c
View File

@ -982,7 +982,7 @@ static u8g2_uint_t u8g2_string_width(u8g2_t *u8g2, const char *str)
return w;
}
u8g2_uint_t u8g2_GetStringWidth(u8g2_t *u8g2, const char *s)
u8g2_uint_t u8g2_GetStrWidth(u8g2_t *u8g2, const char *s)
{
u8g2->u8x8.char_cb = u8x8_get_char_from_string;
return u8g2_string_width(u8g2, s);
@ -1006,7 +1006,7 @@ u8g2_uint_t u8g2_GetUTF8Width(u8g2_t *u8g2, const char *str)
#ifdef OBSOLETE
u8g2_uint_t u8g2_GetStringWidth(u8g2_t *u8g2, const char *s)
u8g2_uint_t u8g2_GetStrWidth(u8g2_t *u8g2, const char *s)
{
uint16_t e;
u8g2_uint_t w;

2
sys/tga/ref_man_pics_8x8/main.c
View File

@ -41,7 +41,7 @@ void ra(uint8_t tx, uint8_t ty, const char *s)
u8g2_DrawHVLine(&desc, x-30, y, 20, 0);
u8g2_DrawHVLine(&desc, x-30, y+1, 28, 0);
w = u8g2_GetStringWidth(&desc, s);
w = u8g2_GetStrWidth(&desc, s);
u8g2_DrawStr(&desc, x-34-w, y+u8g2_GetAscent(&desc)/2, s);

4
sys/tga/ref_man_pics_u8g2/main.c
View File

@ -83,7 +83,7 @@ void ra(uint16_t tx, uint16_t ty, const char *s)
u8g2_DrawHVLine(&desc, x-30, y, 20, 0);
u8g2_DrawHVLine(&desc, x-30, y+1, 28, 0);
w = u8g2_GetStringWidth(&desc, s);
w = u8g2_GetStrWidth(&desc, s);
u8g2_DrawStr(&desc, x-34-w, y+u8g2_GetAscent(&desc)/2, s);
@ -104,7 +104,7 @@ void vm(uint16_t tx, uint16_t ty, uint16_t dy)
u8g2_DrawHVLine(&desc, x-3, y-dy*3, 7, 0);
sprintf(s, "%d", dy);
w = u8g2_GetStringWidth(&desc, s);
w = u8g2_GetStrWidth(&desc, s);
u8g2_DrawStr(&desc, x+6, y-(dy*3)/2+u8g2_GetAscent(&desc)/2, s);
}