alex/Adafruit-GFX-Library
1
0
Fork 0
mirror of https://github.com/adafruit/Adafruit-GFX-Library.git synced 2024-10-03 18:18:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Revert "Text magnification factor can be defined separately for X and for Y axis""

Browse Source
This commit is contained in:
Melissa LeBlanc-Williams 2019-06-12 13:53:17 -07:00 committed by GitHub
parent 63db7abafc
commit 60e0e6335f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 144 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
Adafruit_GFX.cpp
View File

@ -84,7 +84,7 @@ WIDTH(w), HEIGHT(h)
_height = HEIGHT; _height = HEIGHT;
rotation = 0; rotation = 0;
cursor_y = cursor_x = 0; cursor_y = cursor_x = 0;
textsize = 1; textsize_x = textsize_y = 1;
textcolor = textbgcolor = 0xFFFF; textcolor = textbgcolor = 0xFFFF;
wrap = true; wrap = true;
_cp437 = false; _cp437 = false;
@ -772,7 +772,7 @@ void Adafruit_GFX::drawBitmap(int16_t x, int16_t y,
/**************************************************************************/ /**************************************************************************/
/*! /*!
@brief Draw PROGMEM-resident XBitMap Files (*.xbm), exported from GIMP. @brief Draw PROGMEM-resident XBitMap Files (*.xbm), exported from GIMP.
Usage: Export from GIMP to *.xbm, rename *.xbm to *.c and open in editor. Usage: Export from GIMP to *.xbm, rename *.xbm to *.c and open in editor.
C Array can be directly used with this function. C Array can be directly used with this function.
There is no RAM-resident version of this function; if generating bitmaps There is no RAM-resident version of this function; if generating bitmaps
@ -807,7 +807,7 @@ void Adafruit_GFX::drawXBitmap(int16_t x, int16_t y,
/**************************************************************************/ /**************************************************************************/
/*! /*!
@brief Draw a PROGMEM-resident 8-bit image (grayscale) at the specified (x,y) pos. @brief Draw a PROGMEM-resident 8-bit image (grayscale) at the specified (x,y) pos.
Specifically for 8-bit display devices such as IS31FL3731; no color reduction/expansion is performed. Specifically for 8-bit display devices such as IS31FL3731; no color reduction/expansion is performed.
@param x Top left corner x coordinate @param x Top left corner x coordinate
@param y Top left corner y coordinate @param y Top left corner y coordinate
@ -829,7 +829,7 @@ void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y,
/**************************************************************************/ /**************************************************************************/
/*! /*!
@brief Draw a RAM-resident 8-bit image (grayscale) at the specified (x,y) pos. @brief Draw a RAM-resident 8-bit image (grayscale) at the specified (x,y) pos.
Specifically for 8-bit display devices such as IS31FL3731; no color reduction/expansion is performed. Specifically for 8-bit display devices such as IS31FL3731; no color reduction/expansion is performed.
@param x Top left corner x coordinate @param x Top left corner x coordinate
@param y Top left corner y coordinate @param y Top left corner y coordinate
@ -916,7 +916,7 @@ void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y,
/**************************************************************************/ /**************************************************************************/
/*! /*!
@brief Draw a PROGMEM-resident 16-bit image (RGB 5/6/5) at the specified (x,y) position. @brief Draw a PROGMEM-resident 16-bit image (RGB 5/6/5) at the specified (x,y) position.
For 16-bit display devices; no color reduction performed. For 16-bit display devices; no color reduction performed.
@param x Top left corner x coordinate @param x Top left corner x coordinate
@param y Top left corner y coordinate @param y Top left corner y coordinate
@ -938,7 +938,7 @@ void Adafruit_GFX::drawRGBBitmap(int16_t x, int16_t y,
/**************************************************************************/ /**************************************************************************/
/*! /*!
@brief Draw a RAM-resident 16-bit image (RGB 5/6/5) at the specified (x,y) position. @brief Draw a RAM-resident 16-bit image (RGB 5/6/5) at the specified (x,y) position.
For 16-bit display devices; no color reduction performed. For 16-bit display devices; no color reduction performed.
@param x Top left corner x coordinate @param x Top left corner x coordinate
@param y Top left corner y coordinate @param y Top left corner y coordinate
@ -1032,13 +1032,31 @@ void Adafruit_GFX::drawRGBBitmap(int16_t x, int16_t y,
/**************************************************************************/ /**************************************************************************/
void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c, void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
uint16_t color, uint16_t bg, uint8_t size) { uint16_t color, uint16_t bg, uint8_t size) {
drawChar(x, y, c, color, bg, size, size);
}
// Draw a character
/**************************************************************************/
/*!
@brief Draw a single character
@param x Bottom left corner x coordinate
@param y Bottom left corner y coordinate
@param c The 8-bit font-indexed character (likely ascii)
@param color 16-bit 5-6-5 Color to draw chraracter with
@param bg 16-bit 5-6-5 Color to fill background with (if same as color, no background)
@param size_x Font magnification level in X-axis, 1 is 'original' size
@param size_y Font magnification level in Y-axis, 1 is 'original' size
*/
/**************************************************************************/
void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
uint16_t color, uint16_t bg, uint8_t size_x, uint8_t size_y) {
if(!gfxFont) { // 'Classic' built-in font if(!gfxFont) { // 'Classic' built-in font
if((x >= _width) || // Clip right if((x >= _width) || // Clip right
(y >= _height) || // Clip bottom (y >= _height) || // Clip bottom
((x + 6 * size - 1) < 0) || // Clip left ((x + 6 * size_x - 1) < 0) || // Clip left
((y + 8 * size - 1) < 0)) // Clip top ((y + 8 * size_y - 1) < 0)) // Clip top
return; return;
if(!_cp437 && (c >= 176)) c++; // Handle 'classic' charset behavior if(!_cp437 && (c >= 176)) c++; // Handle 'classic' charset behavior
@ -1048,21 +1066,21 @@ void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
uint8_t line = pgm_read_byte(&font[c * 5 + i]); uint8_t line = pgm_read_byte(&font[c * 5 + i]);
for(int8_t j=0; j<8; j++, line >>= 1) { for(int8_t j=0; j<8; j++, line >>= 1) {
if(line & 1) { if(line & 1) {
if(size == 1) if(size_x == 1 && size_y == 1)
writePixel(x+i, y+j, color); writePixel(x+i, y+j, color);
else else
writeFillRect(x+i*size, y+j*size, size, size, color); writeFillRect(x+i*size_x, y+j*size_y, size_x, size_y, color);
} else if(bg != color) { } else if(bg != color) {
if(size == 1) if(size_x == 1 && size_y == 1)
writePixel(x+i, y+j, bg); writePixel(x+i, y+j, bg);
else else
writeFillRect(x+i*size, y+j*size, size, size, bg); writeFillRect(x+i*size_x, y+j*size_y, size_x, size_y, bg);
} }
} }
} }
if(bg != color) { // If opaque, draw vertical line for last column if(bg != color) { // If opaque, draw vertical line for last column
if(size == 1) writeFastVLine(x+5, y, 8, bg); if(size_x == 1 && size_y == 1) writeFastVLine(x+5, y, 8, bg);
else writeFillRect(x+5*size, y, size, 8*size, bg); else writeFillRect(x+5*size_x, y, size_x, 8*size_y, bg);
} }
endWrite(); endWrite();
@ -1084,7 +1102,7 @@ void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
uint8_t xx, yy, bits = 0, bit = 0; uint8_t xx, yy, bits = 0, bit = 0;
int16_t xo16 = 0, yo16 = 0; int16_t xo16 = 0, yo16 = 0;
if(size > 1) { if(size_x > 1 || size_y > 1) {
xo16 = xo; xo16 = xo;
yo16 = yo; yo16 = yo;
} }
@ -1114,11 +1132,11 @@ void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
bits = pgm_read_byte(&bitmap[bo++]); bits = pgm_read_byte(&bitmap[bo++]);
} }
if(bits & 0x80) { if(bits & 0x80) {
if(size == 1) { if(size_x == 1 && size_y == 1) {
writePixel(x+xo+xx, y+yo+yy, color); writePixel(x+xo+xx, y+yo+yy, color);
} else { } else {
writeFillRect(x+(xo16+xx)*size, y+(yo16+yy)*size, writeFillRect(x+(xo16+xx)*size_x, y+(yo16+yy)*size_y,
size, size, color); size_x, size_y, color);
} }
} }
bits <<= 1; bits <<= 1;
@ -1139,21 +1157,21 @@ size_t Adafruit_GFX::write(uint8_t c) {
if(c == '\n') { // Newline? if(c == '\n') { // Newline?
cursor_x = 0; // Reset x to zero, cursor_x = 0; // Reset x to zero,
cursor_y += textsize * 8; // advance y one line cursor_y += textsize_y * 8; // advance y one line
} else if(c != '\r') { // Ignore carriage returns } else if(c != '\r') { // Ignore carriage returns
if(wrap && ((cursor_x + textsize * 6) > _width)) { // Off right? if(wrap && ((cursor_x + textsize_x * 6) > _width)) { // Off right?
cursor_x = 0; // Reset x to zero, cursor_x = 0; // Reset x to zero,
cursor_y += textsize * 8; // advance y one line cursor_y += textsize_y * 8; // advance y one line
} }
drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize); drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize_x, textsize_y);
cursor_x += textsize * 6; // Advance x one char cursor_x += textsize_x * 6; // Advance x one char
} }
} else { // Custom font } else { // Custom font
if(c == '\n') { if(c == '\n') {
cursor_x = 0; cursor_x = 0;
cursor_y += (int16_t)textsize * cursor_y += (int16_t)textsize_y *
(uint8_t)pgm_read_byte(&gfxFont->yAdvance); (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
} else if(c != '\r') { } else if(c != '\r') {
uint8_t first = pgm_read_byte(&gfxFont->first); uint8_t first = pgm_read_byte(&gfxFont->first);
@ -1164,14 +1182,14 @@ size_t Adafruit_GFX::write(uint8_t c) {
h = pgm_read_byte(&glyph->height); h = pgm_read_byte(&glyph->height);
if((w > 0) && (h > 0)) { // Is there an associated bitmap? if((w > 0) && (h > 0)) { // Is there an associated bitmap?
int16_t xo = (int8_t)pgm_read_byte(&glyph->xOffset); // sic int16_t xo = (int8_t)pgm_read_byte(&glyph->xOffset); // sic
if(wrap && ((cursor_x + textsize * (xo + w)) > _width)) { if(wrap && ((cursor_x + textsize_x * (xo + w)) > _width)) {
cursor_x = 0; cursor_x = 0;
cursor_y += (int16_t)textsize * cursor_y += (int16_t)textsize_y *
(uint8_t)pgm_read_byte(&gfxFont->yAdvance); (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
} }
drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize); drawChar(cursor_x, cursor_y, c, textcolor, textbgcolor, textsize_x, textsize_y);
} }
cursor_x += (uint8_t)pgm_read_byte(&glyph->xAdvance) * (int16_t)textsize; cursor_x += (uint8_t)pgm_read_byte(&glyph->xAdvance) * (int16_t)textsize_x;
} }
} }
@ -1186,7 +1204,19 @@ size_t Adafruit_GFX::write(uint8_t c) {
*/ */
/**************************************************************************/ /**************************************************************************/
void Adafruit_GFX::setTextSize(uint8_t s) { void Adafruit_GFX::setTextSize(uint8_t s) {
textsize = (s > 0) ? s : 1; setTextSize(s, s);
}
/**************************************************************************/
/*!
@brief Set text 'magnification' size. Each increase in s makes 1 pixel that much bigger.
@param s_x Desired text width magnification level in X-axis. 1 is default
@param s_y Desired text width magnification level in Y-axis. 1 is default
*/
/**************************************************************************/
void Adafruit_GFX::setTextSize(uint8_t s_x, uint8_t s_y) {
textsize_x = (s_x > 0) ? s_x : 1;
textsize_y = (s_y > 0) ? s_y : 1;
} }
/**************************************************************************/ /**************************************************************************/
@ -1253,7 +1283,7 @@ void Adafruit_GFX::charBounds(char c, int16_t *x, int16_t *y,
if(c == '\n') { // Newline? if(c == '\n') { // Newline?
*x = 0; // Reset x to zero, advance y by one line *x = 0; // Reset x to zero, advance y by one line
*y += textsize * (uint8_t)pgm_read_byte(&gfxFont->yAdvance); *y += textsize_y * (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
} else if(c != '\r') { // Not a carriage return; is normal char } else if(c != '\r') { // Not a carriage return; is normal char
uint8_t first = pgm_read_byte(&gfxFont->first), uint8_t first = pgm_read_byte(&gfxFont->first),
last = pgm_read_byte(&gfxFont->last); last = pgm_read_byte(&gfxFont->last);
@ -1265,20 +1295,21 @@ void Adafruit_GFX::charBounds(char c, int16_t *x, int16_t *y,
xa = pgm_read_byte(&glyph->xAdvance); xa = pgm_read_byte(&glyph->xAdvance);
int8_t xo = pgm_read_byte(&glyph->xOffset), int8_t xo = pgm_read_byte(&glyph->xOffset),
yo = pgm_read_byte(&glyph->yOffset); yo = pgm_read_byte(&glyph->yOffset);
if(wrap && ((*x+(((int16_t)xo+gw)*textsize)) > _width)) { if(wrap && ((*x+(((int16_t)xo+gw)*textsize_x)) > _width)) {
*x = 0; // Reset x to zero, advance y by one line *x = 0; // Reset x to zero, advance y by one line
*y += textsize * (uint8_t)pgm_read_byte(&gfxFont->yAdvance); *y += textsize_y * (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
} }
int16_t ts = (int16_t)textsize, int16_t tsx = (int16_t)textsize_x,
x1 = *x + xo * ts, tsy = (int16_t)textsize_y,
y1 = *y + yo * ts, x1 = *x + xo * tsx,
x2 = x1 + gw * ts - 1, y1 = *y + yo * tsy,
y2 = y1 + gh * ts - 1; x2 = x1 + gw * tsx - 1,
y2 = y1 + gh * tsy - 1;
if(x1 < *minx) *minx = x1; if(x1 < *minx) *minx = x1;
if(y1 < *miny) *miny = y1; if(y1 < *miny) *miny = y1;
if(x2 > *maxx) *maxx = x2; if(x2 > *maxx) *maxx = x2;
if(y2 > *maxy) *maxy = y2; if(y2 > *maxy) *maxy = y2;
*x += xa * ts; *x += xa * tsx;
} }
} }
@ -1286,20 +1317,20 @@ void Adafruit_GFX::charBounds(char c, int16_t *x, int16_t *y,
if(c == '\n') { // Newline? if(c == '\n') { // Newline?
*x = 0; // Reset x to zero, *x = 0; // Reset x to zero,
*y += textsize * 8; // advance y one line *y += textsize_y * 8; // advance y one line
// min/max x/y unchaged -- that waits for next 'normal' character // min/max x/y unchaged -- that waits for next 'normal' character
} else if(c != '\r') { // Normal char; ignore carriage returns } else if(c != '\r') { // Normal char; ignore carriage returns
if(wrap && ((*x + textsize * 6) > _width)) { // Off right? if(wrap && ((*x + textsize_x * 6) > _width)) { // Off right?
*x = 0; // Reset x to zero, *x = 0; // Reset x to zero,
*y += textsize * 8; // advance y one line *y += textsize_y * 8; // advance y one line
} }
int x2 = *x + textsize * 6 - 1, // Lower-right pixel of char int x2 = *x + textsize_x * 6 - 1, // Lower-right pixel of char
y2 = *y + textsize * 8 - 1; y2 = *y + textsize_y * 8 - 1;
if(x2 > *maxx) *maxx = x2; // Track max x, y if(x2 > *maxx) *maxx = x2; // Track max x, y
if(y2 > *maxy) *maxy = y2; if(y2 > *maxy) *maxy = y2;
if(*x < *minx) *minx = *x; // Track min x, y if(*x < *minx) *minx = *x; // Track min x, y
if(*y < *miny) *miny = *y; if(*y < *miny) *miny = *y;
*x += textsize * 6; // Advance x one char *x += textsize_x * 6; // Advance x one char
} }
} }
} }
@ -1441,6 +1472,33 @@ void Adafruit_GFX_Button::initButton(
textcolor, label, textsize); textcolor, label, textsize);
} }
/**************************************************************************/
/*!
@brief Initialize button with our desired color/size/settings
@param gfx Pointer to our display so we can draw to it!
@param x The X coordinate of the center of the button
@param y The Y coordinate of the center of the button
@param w Width of the buttton
@param h Height of the buttton
@param outline Color of the outline (16-bit 5-6-5 standard)
@param fill Color of the button fill (16-bit 5-6-5 standard)
@param textcolor Color of the button label (16-bit 5-6-5 standard)
@param label Ascii string of the text inside the button
@param textsize_x The font magnification in X-axis of the label text
@param textsize_y The font magnification in Y-axis of the label text
*/
/**************************************************************************/
// Classic initButton() function: pass center & size
void Adafruit_GFX_Button::initButton(
Adafruit_GFX *gfx, int16_t x, int16_t y, uint16_t w, uint16_t h,
uint16_t outline, uint16_t fill, uint16_t textcolor,
char *label, uint8_t textsize_x, uint8_t textsize_y)
{
// Tweak arguments and pass to the newer initButtonUL() function...
initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill,
textcolor, label, textsize_x, textsize_y);
}
/**************************************************************************/ /**************************************************************************/
/*! /*!
@brief Initialize button with our desired color/size/settings, with upper-left coordinates @brief Initialize button with our desired color/size/settings, with upper-left coordinates
@ -1460,6 +1518,30 @@ void Adafruit_GFX_Button::initButtonUL(
Adafruit_GFX *gfx, int16_t x1, int16_t y1, uint16_t w, uint16_t h, Adafruit_GFX *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) char *label, uint8_t textsize)
{
initButtonUL(gfx, x1, y1, w, h, outline, fill, textcolor, label, textsize, textsize);
}
/**************************************************************************/
/*!
@brief Initialize button with our desired color/size/settings, with upper-left coordinates
@param gfx Pointer to our display so we can draw to it!
@param x1 The X coordinate of the Upper-Left corner of the button
@param y1 The Y coordinate of the Upper-Left corner of the button
@param w Width of the buttton
@param h Height of the buttton
@param outline Color of the outline (16-bit 5-6-5 standard)
@param fill Color of the button fill (16-bit 5-6-5 standard)
@param textcolor Color of the button label (16-bit 5-6-5 standard)
@param label Ascii string of the text inside the button
@param textsize_x The font magnification in X-axis of the label text
@param textsize_y The font magnification in Y-axis of the label text
*/
/**************************************************************************/
void Adafruit_GFX_Button::initButtonUL(
Adafruit_GFX *gfx, int16_t x1, int16_t y1, uint16_t w, uint16_t h,
uint16_t outline, uint16_t fill, uint16_t textcolor,
char *label, uint8_t textsize_x, uint8_t textsize_y)
{ {
_x1 = x1; _x1 = x1;
_y1 = y1; _y1 = y1;
@ -1468,7 +1550,8 @@ void Adafruit_GFX_Button::initButtonUL(
_outlinecolor = outline; _outlinecolor = outline;
_fillcolor = fill; _fillcolor = fill;
_textcolor = textcolor; _textcolor = textcolor;
_textsize = textsize; _textsize_x = textsize_x;
_textsize_y = textsize_y;
_gfx = gfx; _gfx = gfx;
strncpy(_label, label, 9); strncpy(_label, label, 9);
} }
@ -1496,10 +1579,10 @@ void Adafruit_GFX_Button::drawButton(boolean inverted) {
_gfx->fillRoundRect(_x1, _y1, _w, _h, r, fill); _gfx->fillRoundRect(_x1, _y1, _w, _h, r, fill);
_gfx->drawRoundRect(_x1, _y1, _w, _h, r, outline); _gfx->drawRoundRect(_x1, _y1, _w, _h, r, outline);
_gfx->setCursor(_x1 + (_w/2) - (strlen(_label) * 3 * _textsize), _gfx->setCursor(_x1 + (_w/2) - (strlen(_label) * 3 * _textsize_x),
_y1 + (_h/2) - (4 * _textsize)); _y1 + (_h/2) - (4 * _textsize_y));
_gfx->setTextColor(text); _gfx->setTextColor(text);
_gfx->setTextSize(_textsize); _gfx->setTextSize(_textsize_x, _textsize_y);
_gfx->print(_label); _gfx->print(_label);
} }

15
Adafruit_GFX.h
View File

@ -95,6 +95,8 @@ class Adafruit_GFX : public Print {
uint16_t *bitmap, uint8_t *mask, int16_t w, int16_t h), uint16_t *bitmap, uint8_t *mask, int16_t w, int16_t h),
drawChar(int16_t x, int16_t y, unsigned char c, uint16_t color, drawChar(int16_t x, int16_t y, unsigned char c, uint16_t color,
uint16_t bg, uint8_t size), uint16_t bg, uint8_t size),
drawChar(int16_t x, int16_t y, unsigned char c, uint16_t color,
uint16_t bg, uint8_t size_x, uint8_t size_y),
getTextBounds(const char *string, int16_t x, int16_t y, getTextBounds(const char *string, int16_t x, int16_t y,
int16_t *x1, int16_t *y1, uint16_t *w, uint16_t *h), int16_t *x1, int16_t *y1, uint16_t *w, uint16_t *h),
getTextBounds(const __FlashStringHelper *s, int16_t x, int16_t y, getTextBounds(const __FlashStringHelper *s, int16_t x, int16_t y,
@ -102,6 +104,7 @@ class Adafruit_GFX : public Print {
getTextBounds(const String &str, int16_t x, int16_t y, getTextBounds(const String &str, int16_t x, int16_t y,
int16_t *x1, int16_t *y1, uint16_t *w, uint16_t *h), int16_t *x1, int16_t *y1, uint16_t *w, uint16_t *h),
setTextSize(uint8_t s), setTextSize(uint8_t s),
setTextSize(uint8_t sx, uint8_t sy),
setFont(const GFXfont *f = NULL); setFont(const GFXfont *f = NULL);
/**********************************************************************/ /**********************************************************************/
@ -224,7 +227,8 @@ class Adafruit_GFX : public Print {
textcolor, ///< 16-bit background color for print() textcolor, ///< 16-bit background color for print()
textbgcolor; ///< 16-bit text color for print() textbgcolor; ///< 16-bit text color for print()
uint8_t uint8_t
textsize, ///< Desired magnification of text to print() textsize_x, ///< Desired magnification in X-axis of text to print()
textsize_y, ///< Desired magnification in Y-axis of text to print()
rotation; ///< Display rotation (0 thru 3) rotation; ///< Display rotation (0 thru 3)
boolean boolean
wrap, ///< If set, 'wrap' text at right edge of display wrap, ///< If set, 'wrap' text at right edge of display
@ -243,10 +247,16 @@ class Adafruit_GFX_Button {
void initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, void initButton(Adafruit_GFX *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, char *label, uint8_t textsize);
void initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
uint16_t w, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize_x, uint8_t textsize_y);
// New/alt initButton() uses upper-left corner & size // New/alt initButton() uses upper-left corner & size
void initButtonUL(Adafruit_GFX *gfx, int16_t x1, int16_t y1, void initButtonUL(Adafruit_GFX *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, char *label, uint8_t textsize);
void initButtonUL(Adafruit_GFX *gfx, int16_t x1, int16_t y1,
uint16_t w, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize_x, uint8_t textsize_y);
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);
@ -273,7 +283,8 @@ class Adafruit_GFX_Button {
Adafruit_GFX *_gfx; Adafruit_GFX *_gfx;
int16_t _x1, _y1; // Coordinates of top-left corner int16_t _x1, _y1; // Coordinates of top-left corner
uint16_t _w, _h; uint16_t _w, _h;
uint8_t _textsize; uint8_t _textsize_x;
uint8_t _textsize_y;
uint16_t _outlinecolor, _fillcolor, _textcolor; uint16_t _outlinecolor, _fillcolor, _textcolor;
char _label[10]; char _label[10];