Lubuntu/qtermwidget-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding upstream version 0.6.0+20160108.

Browse Source
This commit is contained in:
Alf Gaida 2016-01-11 18:37:17 +01:00
parent f0e1c32f49
commit d85e68a891
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/TerminalDisplay.cpp
View File

@ -1494,12 +1494,10 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
bool save__fixedFont = _fixedFont; bool save__fixedFont = _fixedFont;
if (lineDraw) if (lineDraw)
_fixedFont = false; _fixedFont = false;
if (doubleWidth)
_fixedFont = false;
unistr.resize(p); unistr.resize(p);
// Create a text scaling matrix for double width and double height lines. // Create a text scaling matrix for double width and double height lines.
QMatrix textScale; QTransform textScale;
if (y < _lineProperties.size()) if (y < _lineProperties.size())
{ {
@ -1511,7 +1509,7 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
} }
//Apply text scaling matrix. //Apply text scaling matrix.
paint.setWorldMatrix(textScale, true); paint.setWorldTransform(textScale, true);
//calculate the area in which the text will be drawn //calculate the area in which the text will be drawn
QRect textArea = calculateTextArea(tLx, tLy, x, y, len); QRect textArea = calculateTextArea(tLx, tLy, x, y, len);
@ -1535,7 +1533,7 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
_fixedFont = save__fixedFont; _fixedFont = save__fixedFont;
//reset back to single-width, single-height _lines //reset back to single-width, single-height _lines
paint.setWorldMatrix(textScale.inverted(), true); paint.setWorldTransform(textScale.inverted(), true);
if (y < _lineProperties.size()-1) if (y < _lineProperties.size()-1)
{ {