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

Editor: fix hanging when using invalid printer page rect

Browse Source 
Some printer seem to return an empty page rect for some configuration
which results in an invalide page count and a freezing ui. Do not print
anything and return in that case.

Fixes: QTCREATORBUG-24110
Change-Id: I42349bc97734e3f6a67502482d2b02959e865665
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2020-09-21 10:03:48 +02:00
parent 6e4de116bf
commit da2e8bbf7b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1164,6 +1164,10 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
if (!p.isActive()) if (!p.isActive())
return; return;
QRectF pageRect(printer->pageRect());
if (pageRect.isEmpty())
return;
doc = doc->clone(doc); doc = doc->clone(doc);
Utils::ExecuteOnDestruction docDeleter([doc]() { delete doc; }); Utils::ExecuteOnDestruction docDeleter([doc]() { delete doc; });
@@ -1217,7 +1221,6 @@ void TextEditorWidgetPrivate::print(QPrinter *printer)
fmt.setMargin(margin); fmt.setMargin(margin);
doc->rootFrame()->setFrameFormat(fmt); doc->rootFrame()->setFrameFormat(fmt);
QRectF pageRect(printer->pageRect());
QRectF body = QRectF(0, 0, pageRect.width(), pageRect.height()); QRectF body = QRectF(0, 0, pageRect.width(), pageRect.height());
QFontMetrics fontMetrics(doc->defaultFont(), p.device()); QFontMetrics fontMetrics(doc->defaultFont(), p.device());