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

Add const qualifier to initButton text

This commit is contained in:
Francesco Capano 2019-08-08 21:18:38 +01:00
parent 4f68cf90e8
commit 2824b65069
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Extensions/Button.cpp
View File

@ -10,7 +10,7 @@ TFT_eSPI_Button::TFT_eSPI_Button(void) {
void TFT_eSPI_Button::initButton( void TFT_eSPI_Button::initButton(
TFT_eSPI *gfx, int16_t x, int16_t y, uint16_t w, uint16_t h, TFT_eSPI *gfx, int16_t x, int16_t y, uint16_t w, uint16_t h,
uint16_t outline, uint16_t fill, uint16_t textcolor, uint16_t outline, uint16_t fill, uint16_t textcolor,
char *label, uint8_t textsize) const char *label, uint8_t textsize)
{ {
// Tweak arguments and pass to the newer initButtonUL() function... // Tweak arguments and pass to the newer initButtonUL() function...
initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill,
@ -21,7 +21,7 @@ void TFT_eSPI_Button::initButton(
void TFT_eSPI_Button::initButtonUL( void TFT_eSPI_Button::initButtonUL(
TFT_eSPI *gfx, int16_t x1, int16_t y1, uint16_t w, uint16_t h, TFT_eSPI *gfx, int16_t x1, int16_t y1, uint16_t w, uint16_t h,
uint16_t outline, uint16_t fill, uint16_t textcolor, uint16_t outline, uint16_t fill, uint16_t textcolor,
char *label, uint8_t textsize) const char *label, uint8_t textsize)
{ {
_x1 = x1; _x1 = x1;
_y1 = y1; _y1 = y1;

4
Extensions/Button.h
View File

@ -12,12 +12,12 @@ class TFT_eSPI_Button {
// "Classic" initButton() uses center & size // "Classic" initButton() uses center & size
void initButton(TFT_eSPI *gfx, int16_t x, int16_t y, void initButton(TFT_eSPI *gfx, int16_t x, int16_t y,
uint16_t w, uint16_t h, uint16_t outline, uint16_t fill, uint16_t w, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize); uint16_t textcolor, const char *label, uint8_t textsize);
// New/alt initButton() uses upper-left corner & size // New/alt initButton() uses upper-left corner & size
void initButtonUL(TFT_eSPI *gfx, int16_t x1, int16_t y1, void initButtonUL(TFT_eSPI *gfx, int16_t x1, int16_t y1,
uint16_t w, uint16_t h, uint16_t outline, uint16_t fill, uint16_t w, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize); uint16_t textcolor, const char *label, uint8_t textsize);
void drawButton(boolean inverted = false); void drawButton(boolean inverted = false);
boolean contains(int16_t x, int16_t y); boolean contains(int16_t x, int16_t y);