Seich
/
TFT_eSPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge a2279cbdf3 into 2773d6a148

This commit is contained in:
maxpautsch 2018-07-08 14:08:01 +00:00 committed by GitHub
parent 2773d6a148 a2279cbdf3
commit d605c44aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TFT_eSPI.cpp
View File

@ -2144,6 +2144,10 @@ int16_t TFT_eSPI::fontHeight(int16_t font)
return pgm_read_byte( &fontdata[font].height ) * textsize; return pgm_read_byte( &fontdata[font].height ) * textsize;
} }
int16_t TFT_eSPI::fontHeight()
{
return fontHeight(textfont);
}
/*************************************************************************************** /***************************************************************************************
** Function name: drawChar ** Function name: drawChar

3
TFT_eSPI.h
View File

@ -656,7 +656,8 @@ class TFT_eSPI : public Print {
textWidth(const char *string), textWidth(const char *string),
textWidth(const String& string, int font), textWidth(const String& string, int font),
textWidth(const String& string), 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); void setAddrWindow(int32_t xs, int32_t ys, int32_t xe, int32_t ye);