Merge remote-tracking branch 'github/master' into jfmcarreira-dev

This commit is contained in:
jfmcarreira committed 2014-04-03 17:12:42 +01:00
commit 6ed0373566
1 file changed
-5
-5
View File
@@ -231,11 +231,6 @@ Void SubWindowHandle::zoomToFit()
{
// Scale to a smaller size that the real to a nicer look
QSize niceFit( m_cScrollArea->viewport()->size().width() - 5, m_cScrollArea->viewport()->size().height() - 5 );
if( ( Int )m_pCurrStream->getWidth() <= niceFit.width() && ( Int )m_pCurrStream->getHeight() <= niceFit.height() )
{
normalSize();
return;
}
scaleView( niceFit );
}