mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-04 20:55:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where terminal text is locked at 0,0.

Browse Source 
BUG: 163178

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=963912
This commit is contained in:
Kurt Hindenburg
2009-05-05 15:21:29 +00:00
parent 2515c31d4f
commit 0a6ef8e77f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/TerminalDisplay.cpp
View File

@@ -1434,16 +1434,22 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
if (doubleWidth)
_fixedFont = false;
QString unistr(disstrU,p);
// Create a text scaling matrix for double width and double height lines.
QMatrix textScale;
if (y < _lineProperties.size())
{
if (_lineProperties[y] & LINE_DOUBLEWIDTH)
paint.scale(2,1);
textScale.scale(2,1);
if (_lineProperties[y] & LINE_DOUBLEHEIGHT)
paint.scale(1,2);
textScale.scale(1,2);
}
//Apply text scaling matrix.
paint.setWorldMatrix(textScale, true);
//calculate the area in which the text will be drawn
QRect textArea = QRect( _leftMargin+tLx+_fontWidth*x , _topMargin+tLy+_fontHeight*y , _fontWidth*len , _fontHeight);
@@ -1453,8 +1459,7 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
//transformation has been applied to the painter. this ensures that
//painting does actually start from textArea.topLeft()
//(instead of textArea.topLeft() * painter-scale)
QTransform inverted = paint.worldTransform().inverted();
textArea.moveTopLeft( inverted.map(textArea.topLeft()) );
textArea.moveTopLeft( textScale.inverted().map(textArea.topLeft()) );
//paint text fragment
drawTextFragment( paint,
@@ -1467,7 +1472,7 @@ void TerminalDisplay::drawContents(QPainter &paint, const QRect &rect)
_fixedFont = save__fixedFont;
//reset back to single-width, single-height _lines
paint.resetMatrix();
paint.setWorldMatrix(textScale.inverted(), true);
if (y < _lineProperties.size()-1)
{