Commit 87aca912 authored by Bodmer's avatar Bodmer

Merge branch 'master' of https://github.com/Bodmer/TFT_eSPI

parents 15c13763 135604b5
......@@ -69,9 +69,9 @@ void TFT_eSPI_Button::drawButton(bool inverted, String long_name) {
uint8_t tempdatum = _gfx->getTextDatum();
_gfx->setTextDatum(_textdatum);
if (long_name == "")
_gfx->drawString(_label, _x1 + _xd, _y1 + (_h/2) + _yd);
_gfx->drawString(_label, _x1 + (_w/2) + _xd, _y1 + (_h/2) - 4 + _yd);
else
_gfx->drawString(long_name, _x1 + _xd, _y1 + (_h/2) + _yd);
_gfx->drawString(long_name, _x1 + (_w/2) + _xd, _y1 + (_h/2) - 4 + _yd);
_gfx->setTextDatum(tempdatum);
}
......
......@@ -118,7 +118,7 @@ void drawButtons()
// Adjust button label X delta according to array position
// setLabelDatum(uint16_t x_delta, uint16_t y_delta, uint8_t datum)
key[i].setLabelDatum(i * 10, 0, ML_DATUM);
key[i].setLabelDatum(i * 10 - (KEY_W/2), 0, ML_DATUM);
// Draw button and specify label string
// Specifying label string here will allow more than the default 10 byte label
......
......@@ -99,6 +99,7 @@ TFT_eSPI_Button KEYWORD1
initButton KEYWORD2
textcolor KEYWORD2
initButtonUL KEYWORD2
setLabelDatum KEYWORD2
drawButton KEYWORD2
contains KEYWORD2
press KEYWORD2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment