Skip to content

GitLab

T
TFT_eSPI
Commit 87aca912 authored by Bodmer's avatar Bodmer
Browse files
Options

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

parents 15c13763 135604b5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
Extensions/Button.cpp
View file @ 87aca912
...@@ -69,9 +69,9 @@ void TFT_eSPI_Button::drawButton(bool inverted, String long_name) { ...@@ -69,9 +69,9 @@ 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 == "")
_gfx->drawString(_label, _x1 + _xd, _y1 + (_h/2) + _yd); _gfx->drawString(_label, _x1 + (_w/2) + _xd, _y1 + (_h/2) - 4 + _yd);
else 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); _gfx->setTextDatum(tempdatum);
} }
......
examples/Generic/TFT_Button_Label_Datum/TFT_Button_Label_Datum.ino
View file @ 87aca912
...@@ -118,7 +118,7 @@ void drawButtons() ...@@ -118,7 +118,7 @@ void drawButtons()
// Adjust button label X delta according to array position // Adjust button label X delta according to array position
// setLabelDatum(uint16_t x_delta, uint16_t y_delta, uint8_t datum) // 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 // Draw button and specify label string
// Specifying label string here will allow more than the default 10 byte label // Specifying label string here will allow more than the default 10 byte label
......
keywords.txt
View file @ 87aca912
...@@ -99,6 +99,7 @@ TFT_eSPI_Button KEYWORD1 ...@@ -99,6 +99,7 @@ TFT_eSPI_Button KEYWORD1
initButton KEYWORD2 initButton KEYWORD2
textcolor KEYWORD2 textcolor KEYWORD2
initButtonUL KEYWORD2 initButtonUL KEYWORD2
setLabelDatum KEYWORD2
drawButton KEYWORD2 drawButton KEYWORD2
contains KEYWORD2 contains KEYWORD2
press 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