Skip to content

Bug fix. Rendering of text using U8g2 fonts now obeys previously defined left and upper text bounds set with setTextBound. #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bfranke1973 wants to merge 1 commit into
base: master
Choose a base branch
from
+3,145 −2
Open

Bug fix. Rendering of text using U8g2 fonts now obeys previously defined left and upper text bounds set with setTextBound. #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/Arduino_GFX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,13 +1949,20 @@ void Arduino_GFX::u8g2_font_decode_len(uint8_t len, uint8_t is_foreground, uint1
y = _u8g2_target_y + ly;

/* draw foreground and background (if required) */
if ((x <= _max_text_x) && (y <= _max_text_y))
if ((x <= _max_text_x) && (y <= _max_text_y) && (u >= _min_text_y))
{
curW = current;
if ((x + curW - 1) > _max_text_x)
{
curW = _max_text_x - x + 1;
}
if (x < _min_text_x)
{
// Clip left margin, i.e. characters partially to the left of
// edge of the text bound
curW = max(0,(curW - (_min_text_x - x)));
x = _min_text_x;
}
if (is_foreground)
{
writeFillRect(x, y, curW, 1, color);
Expand All @@ -1973,13 +1980,20 @@ void Arduino_GFX::u8g2_font_decode_len(uint8_t len, uint8_t is_foreground, uint1
y = _u8g2_target_y + (ly * textsize_y);

/* draw foreground and background (if required) */
if (((x + textsize_x - 1) <= _max_text_x) && ((y + textsize_y - 1) <= _max_text_y))
if (((x + textsize_x - 1) <= _max_text_x) && ((y + textsize_y - 1) <= _max_text_y) && (y + textsize_y -1) >= _min_text_y)
{
curW = current * textsize_x;
while ((x + curW - 1) > _max_text_x)
{
curW -= textsize_x;
}
if (x < _min_text_x)
{
// Clip left margin, i.e. characters partially to the left of
// edge of the text bound
curW = max(0,(curW - (_min_text_x - x)));
x = _min_text_x;
}
if (is_foreground)
{
writeFillRect(x, y, curW - text_pixel_margin,
Expand Down Expand Up @@ -2156,6 +2170,10 @@ void Arduino_GFX::drawChar(int16_t x, int16_t y, unsigned char c,

_u8g2_target_x = x + (_u8g2_char_x * textsize_x);
// log_d("_u8g2_target_x: %d, _u8g2_target_y: %d", _u8g2_target_x, _u8g2_target_y);
if (_u8g2_target_x + _u8g2_char_width < _min_text_x) {
// Clip left, i.e. characters entirely to the left of the left text bound
return;
}

/* reset local x/y position */
_u8g2_dx = 0;
Expand Down
Loading