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

OutputWindow: Fix freeze when zooming out very far

Browse Source 
Task-number: QTCREATORBUG-22721
Change-Id: I5a3bc8d1aa677614bd7fdc5e5094b589721e378d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Andre Hartmann
2019-07-15 19:59:30 +02:00
committed by Eike Ziller
parent 2d402bf7fe
commit 2ec58eac25
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -232,6 +232,12 @@ void OutputWindow::wheelEvent(QWheelEvent *e)
if (d->zoomEnabled) { if (d->zoomEnabled) {
if (e->modifiers() & Qt::ControlModifier) { if (e->modifiers() & Qt::ControlModifier) {
float delta = e->angleDelta().y() / 120.f; float delta = e->angleDelta().y() / 120.f;
// Workaround for QTCREATORBUG-22721, remove when properly fixed in Qt
const float newSize = float(font().pointSizeF()) + delta;
if (delta < 0.f && newSize < 4.f)
return;
zoomInF(delta); zoomInF(delta);
emit wheelZoom(); emit wheelZoom();
return; return;