Fixed #437 - 'one point' errors - in map composer and also in map canvas

wonder · wonder · commit f81e8afc0cd4 · 2006-12-08T15:33:57.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6212 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/composer/qgscomposermap.cpp b/src/composer/qgscomposermap.cpp
@@ -294,7 +294,7 @@ void QgsComposerMap::draw ( QPainter & painter )
       painter.setBrush( Qt::NoBrush );
 	    painter.save();
       painter.translate ( Q3CanvasRectangle::x(), Q3CanvasRectangle::y() );
-      painter.drawRect ( 0, 0, Q3CanvasRectangle::width()+1, Q3CanvasRectangle::height()+1 ); // is it right?
+      painter.drawRect ( 0, 0, Q3CanvasRectangle::width(), Q3CanvasRectangle::height() );
         painter.restore();
     }
 
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -699,13 +699,11 @@ void QgsMapCanvas::resizeEvent(QResizeEvent * e)
 
   // Adjust the size (in pixels) of that we draw by the margins in
   // the widget that the drawing eventually gets placed in. In my testing
-  // the margin was 2 pixels on each border. Add 1 more pixel just to
-  // be sure that the drawn map appears fully within the margins in
-  // the widget.
+  // the margin was 2 pixels on each border.
   int top, bottom, right, left;
   getContentsMargins(&left, &top, &right, &bottom);
-  width = width - (left + right + 1);
-  height = height - (top + bottom + 1);
+  width = width - (left + right);
+  height = height - (top + bottom);
 
   mMap->resize(/*e->size()*/ QSize(width,height));
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ void QgsComposerMap::draw ( QPainter & painter )`
`294`	`294`	`painter.setBrush( Qt::NoBrush );`
`295`	`295`	`painter.save();`
`296`	`296`	`painter.translate ( Q3CanvasRectangle::x(), Q3CanvasRectangle::y() );`
`297`		`- painter.drawRect ( 0, 0, Q3CanvasRectangle::width()+1, Q3CanvasRectangle::height()+1 ); // is it right?`
	`297`	`+ painter.drawRect ( 0, 0, Q3CanvasRectangle::width(), Q3CanvasRectangle::height() );`
`298`	`298`	`painter.restore();`
`299`	`299`	`}`
`300`	`300`