This commit is contained in:
Bodmer
2018-01-27 02:35:25 +00:00
parent 6c993f8fd2
commit b2e4e69f7a
2 changed files with 5 additions and 5 deletions

View File

@@ -3306,7 +3306,7 @@ void TFT_eSPI::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color)
** Description: draw a filled rectangle ** Description: draw a filled rectangle
***************************************************************************************/ ***************************************************************************************/
#if defined (ESP8266) && !defined (RPI_WRITE_STROBE) #if defined (ESP8266) && !defined (RPI_WRITE_STROBE)
void TFT_eSPI::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color) void TFT_eSPI::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
{ {
// rudimentary clipping (drawChar w/big text requires this) // rudimentary clipping (drawChar w/big text requires this)
if ((x > _width) || (y > _height) || (w < 1) || (h < 1)) return; if ((x > _width) || (y > _height) || (w < 1) || (h < 1)) return;
@@ -3325,7 +3325,7 @@ void TFT_eSPI::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t c
#else #else
void TFT_eSPI::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color) void TFT_eSPI::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
{ {
// rudimentary clipping (drawChar w/big text requires this) // rudimentary clipping (drawChar w/big text requires this)
if ((x > _width) || (y > _height) || (w < 1) || (h < 1)) return; if ((x > _width) || (y > _height) || (w < 1) || (h < 1)) return;
@@ -5566,7 +5566,7 @@ void TFT_eSprite::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color)
** Function name: fillRect ** Function name: fillRect
** Description: draw a filled rectangle ** Description: draw a filled rectangle
*************************************************************************************x*/ *************************************************************************************x*/
void TFT_eSprite::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color) void TFT_eSprite::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
{ {
if (!_created ) return; if (!_created ) return;

View File

@@ -334,7 +334,7 @@ class TFT_eSPI : public Print {
drawLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t color), drawLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t color),
drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color), drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color),
drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color), drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color),
fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color); fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color);
virtual int16_t drawChar(unsigned int uniCode, int x, int y, int font), virtual int16_t drawChar(unsigned int uniCode, int x, int y, int font),
drawChar(unsigned int uniCode, int x, int y); drawChar(unsigned int uniCode, int x, int y);
@@ -617,7 +617,7 @@ class TFT_eSprite : public TFT_eSPI {
drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color), drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color),
drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color), drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color),
fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color), fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color),
// Set the sprite text cursor position for print class (does not change the TFT screen cursor) // Set the sprite text cursor position for print class (does not change the TFT screen cursor)
setCursor(int16_t x, int16_t y); setCursor(int16_t x, int16_t y);