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

Restrict image viewer scaling to something reasonable.

Browse Source 
Task-number: QTCREATORBUG-4383

Change-Id: Iba7925b6ae62346b25e2eaa9c3da26b2a7cf08ec
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Eike Ziller
2011-12-09 07:39:20 +01:00
parent 7ee895b6dd
commit 6acf123c6a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/imageviewer/imageview.cpp
View File

@@ -190,7 +190,16 @@ void ImageView::setViewOutline(bool enable)
void ImageView::doScale(qreal factor) void ImageView::doScale(qreal factor)
{ {
scale(factor, factor); qreal currentScale = transform().m11();
qreal newScale = currentScale * factor;
qreal actualFactor = factor;
// cap to 0.001 - 1000
if (newScale > 1000)
actualFactor = 1000./currentScale;
else if (newScale < 0.001)
actualFactor = 0.001/currentScale;
scale(actualFactor, actualFactor);
emitScaleFactor(); emitScaleFactor();
} }