Skip to content

Commit

Permalink
Revert "Fix glitch on mouse-wheel zoom event"
Browse files Browse the repository at this point in the history
This reverts commit 40e0d78.

Fixed the mouse wheel zoom regression but it broke proper rendering
of rotated maps...
  • Loading branch information
Sandro Santilli committed Dec 12, 2014
1 parent 69b27f0 commit fd15a16
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/gui/qgsmapcanvasmap.cpp
Expand Up @@ -50,14 +50,6 @@ void QgsMapCanvasMap::paint( QPainter* painter )
if ( mImage.size() != QSize( w, h ) ) if ( mImage.size() != QSize( w, h ) )
{ {
QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2 item %3,%4" ).arg( mImage.width() ).arg( mImage.height() ).arg( w ).arg( h ) ); QgsDebugMsg( QString( "map paint DIFFERENT SIZE: img %1,%2 item %3,%4" ).arg( mImage.width() ).arg( mImage.height() ).arg( w ).arg( h ) );
}

// TODO: this is an hack, we should instead make sure that
// the image passed here from QgsMapCanvas, via setContent,
// is pre-clipped in case of rotation.
// See http://hub.qgis.org/issues/11811
if ( ( mImage.width() > w && mImage.height() < h ) ||
( mImage.height() > h && mImage.width() < w ) ) {
int tX = ( w - mImage.width() ) / 2.0; int tX = ( w - mImage.width() ) / 2.0;
int tY = ( h - mImage.height() ) / 2.0; int tY = ( h - mImage.height() ) / 2.0;
int fX = 0; int fX = 0;
Expand Down

0 comments on commit fd15a16

Please sign in to comment.