From 49535581ad31028a96bedded08490f047f56e65e Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 14 Oct 2016 08:34:22 +1000
Subject: [PATCH] Fix incorrect selection rect drawn for composer items on
 windows

---
 src/core/composer/qgscomposermousehandles.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp
index 7d571bc14491..9f81b445cb55 100644
--- a/src/core/composer/qgscomposermousehandles.cpp
+++ b/src/core/composer/qgscomposermousehandles.cpp
@@ -194,7 +194,12 @@ void QgsComposerMouseHandles::drawSelectedItemBounds( QPainter* painter )
       //not resizing or moving, so just map from scene bounds
       itemBounds = mapRectFromItem(( *itemIter ), ( *itemIter )->rectWithFrame() );
     }
-    painter->drawPolygon( itemBounds );
+
+    // drawPolygon causes issues on windows - corners of path may be missing resulting in triangles being drawn
+    // instead of rectangles! (Same cause as #13343)
+    QPainterPath path;
+    path.addPolygon( itemBounds );
+    painter->drawPath( path );
   }
   painter->restore();
 }