Merge a2279cbdf3 into 2773d6a148
This commit is contained in:
commit
d605c44aa4
|
|
@ -2144,6 +2144,10 @@ int16_t TFT_eSPI::fontHeight(int16_t font)
|
|||
return pgm_read_byte( &fontdata[font].height ) * textsize;
|
||||
}
|
||||
|
||||
int16_t TFT_eSPI::fontHeight()
|
||||
{
|
||||
return fontHeight(textfont);
|
||||
}
|
||||
|
||||
/***************************************************************************************
|
||||
** Function name: drawChar
|
||||
|
|
|
|||
|
|
@ -656,7 +656,8 @@ class TFT_eSPI : public Print {
|
|||
textWidth(const char *string),
|
||||
textWidth(const String& string, int font),
|
||||
textWidth(const String& string),
|
||||
fontHeight(int16_t font);
|
||||
fontHeight(int16_t font),
|
||||
fontHeight();
|
||||
|
||||
void setAddrWindow(int32_t xs, int32_t ys, int32_t xe, int32_t ye);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue