diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2019-07-15 19:59:30 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-07-31 07:20:25 +0000 |
| commit | 2ec58eac25e2c58b84d96ada85ef727d4a6685ef (patch) | |
| tree | 9282021ce6d4f728d4cbe0f85425f4d38084102b /src/plugins/coreplugin | |
| parent | 2d402bf7fefb76cd18c8c0b291d688bc8f201714 (diff) | |
| download | qt-creator-2ec58eac25e2c58b84d96ada85ef727d4a6685ef.tar.gz | |
OutputWindow: Fix freeze when zooming out very far
Task-number: QTCREATORBUG-22721
Change-Id: I5a3bc8d1aa677614bd7fdc5e5094b589721e378d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
| -rw-r--r-- | src/plugins/coreplugin/outputwindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index e89f999a47..6c33b8dafe 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -232,6 +232,12 @@ void OutputWindow::wheelEvent(QWheelEvent *e) if (d->zoomEnabled) { if (e->modifiers() & Qt::ControlModifier) { 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); emit wheelZoom(); return; |