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

Fix indentation in Button.cpp

This commit is contained in:
Just Call Me Koko 2020-02-03 19:46:06 -05:00 committed by Kokotkiewicz
parent 89101c5554
commit d46ec7dded
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Extensions/Button.cpp
View File

@ -69,9 +69,13 @@ void TFT_eSPI_Button::drawButton(bool inverted, String long_name) {
uint8_t tempdatum = _gfx->getTextDatum(); uint8_t tempdatum = _gfx->getTextDatum();
_gfx->setTextDatum(_textdatum); _gfx->setTextDatum(_textdatum);
if (long_name == "") if (long_name == "")
<<<<<<< HEAD
//_gfx->drawString(_label, _x1 + (_w/2), _y1 + (_h/2) -4); //_gfx->drawString(_label, _x1 + (_w/2), _y1 + (_h/2) -4);
<<<<<<< HEAD <<<<<<< HEAD
_gfx->drawString(_label, _x1 + _xd, _y1 + (_h/2) + _yd); _gfx->drawString(_label, _x1 + _xd, _y1 + (_h/2) + _yd);
=======
_gfx->drawString(_label, _x1 + _xd, _y1 + (_h/2) + _yd);
>>>>>>> a21f7e5... Fix indentation in Button.cpp
else else
_gfx->drawString(long_name, _x1 + _xd, _y1 + (_h/2) + _yd); _gfx->drawString(long_name, _x1 + _xd, _y1 + (_h/2) + _yd);
======= =======