Skip to content

Fix double-width line (DECDWL / ESC #6) fragment positioning #46

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

Fix double-width line (DECDWL / ESC #6) fragment positioning #46

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
13 changes: 7 additions & 6 deletions lib/TerminalDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,12 +2007,13 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
QRect textArea = calculateTextArea(tLx, tLy, x, y, len);

//move the calculated area to take account of scaling applied to the painter.
//the position of the area from the origin (0,0) is scaled
//by the opposite of whatever
//transformation has been applied to the painter. this ensures that
//painting does actually start from textArea.topLeft()
//(instead of textArea.topLeft() * painter-scale)
textArea.moveTopLeft( textScale.inverted().map(textArea.topLeft()) );
//Only the origin offset (margins) is inverse-mapped so the painter
//scale does not shift it. The column/row position is left unmapped
//so the painter scale correctly doubles it for double-width/height lines.
QPoint origin = textScale.inverted().map(QPoint(_leftMargin + tLx, _topMargin + tLy));
int colLeft = _fixedFont ? _fontWidth * x : textWidth(0, x, y);
int colTop = _fontHeight * y;
textArea.moveTopLeft(QPoint(origin.x() + colLeft, origin.y() + colTop));

//paint text fragment
drawTextFragment(paint,
Expand Down