Skip to content

Fix underline and strikethrough not being drawn across spaces #2

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
kay-ws wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix underline and strikethrough not being drawn across spaces #2

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
17 changes: 15 additions & 2 deletions src/screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ void Screen::drawText(u32 x, u32 y, u8 fc, u8 bc, u16 num, u16 *text, bool *dw,
if (draw_space) {
draw_space = false;
fillRect(startx, y, x - startx, FH(1), bc);
drawDecoration(startx, y, x - startx, FH(1), fc, ul, st);
}

if (!draw_text) {
Expand All @@ -294,9 +295,22 @@ void Screen::drawText(u32 x, u32 y, u8 fc, u8 bc, u16 num, u16 *text, bool *dw,
drawGlyphs(startx, y, fc, bc, startnum - num, starttext, startdw, ul, st, it);
} else if (draw_space) {
fillRect(startx, y, x - startx, FH(1), bc);
drawDecoration(startx, y, x - startx, FH(1), fc, ul, st);
}
}

/*
* Underline / strikethrough for one run of cells. Kept in one place so that
* glyph runs and space runs cannot drift apart: drawText() splits a line into
* both kinds, and a space in the middle of an underlined run must still be
* underlined.
*/
void Screen::drawDecoration(u32 x, u32 y, u32 w, u32 h, u8 fc, bool ul, bool st)
{
if (st) fillRect(x, y + h / 2, w, 1, fc);
if (ul) fillRect(x, y + h - 2, w, 1, fc);
}

void Screen::drawGlyphs(u32 x, u32 y, u8 fc, u8 bc, u16 num, u16 *text, bool *dw, bool ul, bool st, bool it)
{
for (; num--; text++, dw++) {
Expand Down Expand Up @@ -393,8 +407,7 @@ void Screen::drawGlyph(u32 x, u32 y, u8 fc, u8 bc, u16 code, bool dw, bool ul, b
(this->*draw)(x + mOffsetLeft, y + mOffsetTop, nwidth, fc, bc, pixmap);
}

if (st) fillRect(cellx, celly + h / 2, w, 1, fc); // strikethrough
if (ul) fillRect(cellx, celly + h - 2, w, 1, fc); // underline
drawDecoration(cellx, celly, w, h, fc, ul, st);
}

void Screen::rotateRect(u32 &x, u32 &y, u32 &w, u32 &h)
Expand Down
1 change: 1 addition & 0 deletions src/screen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public :
void eraseMargin(bool top, u16 h);
void drawGlyphs(u32 x, u32 y, u8 fc, u8 bc, u16 num, u16 *text, bool *dw, bool ul, bool st, bool it);
void drawGlyph(u32 x, u32 y, u8 fc, u8 bc, u16 code, bool dw, bool ul, bool st, bool it);
void drawDecoration(u32 x, u32 y, u32 w, u32 h, u8 fc, bool ul, bool st);
void adjustOffset(u32 &x, u32 &y);

void initFillDraw();
Expand Down