feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	share/qtcreator/debugger/creatortypes.py
	src/plugins/beautifier/clangformat/clangformat.cpp

Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf
This commit is contained in:
Eike Ziller
2016-05-11 13:28:35 +02:00
parent 3d9ef5c813 d8e38131b7
commit 3d751dcf44
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/texteditor/texteditor.cpp
View File

@@ -794,17 +794,17 @@ static void printPage(int index, QPainter *painter, const QTextDocument *doc,
painter->save();
painter->translate(body.left(), body.top() - (index - 1) * body.height());
QRectF view(0, (index - 1) * body.height(), body.width(), body.height());
const QRectF view(0, (index - 1) * body.height(), body.width(), body.height());
QAbstractTextDocumentLayout *layout = doc->documentLayout();
QAbstractTextDocumentLayout::PaintContext ctx;
painter->setFont(QFont(doc->defaultFont()));
QRectF box = titleBox.translated(0, view.top());
int dpix = painter->device()->logicalDpiX();
int dpiy = painter->device()->logicalDpiY();
int mx = 5 * dpix / 72.0;
int my = 2 * dpiy / 72.0;
const QRectF box = titleBox.translated(0, view.top());
const int dpix = painter->device()->logicalDpiX();
const int dpiy = painter->device()->logicalDpiY();
const int mx = 5 * dpix / 72.0;
const int my = 2 * dpiy / 72.0;
painter->fillRect(box.adjusted(-mx, -my, mx, my), QColor(210, 210, 210));
if (!title.isEmpty())
painter->drawText(box, Qt::AlignCenter, title);