From 001390c160a71ad0d4f98752c057c506010bfc92 Mon Sep 17 00:00:00 2001
From: Eugene Prilepin <esp.home@gmail.com>
Date: Mon, 25 Apr 2016 11:35:24 +0300
Subject: [PATCH] Bugfix: GraphicsLayout border drawing

- Fixed border overlapping (issue #316)
---
 pyqtgraph/graphicsItems/GraphicsLayout.py | 48 ++++++++++++++++-------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/pyqtgraph/graphicsItems/GraphicsLayout.py b/pyqtgraph/graphicsItems/GraphicsLayout.py
index 6ec38fb5..c0db5890 100644
--- a/pyqtgraph/graphicsItems/GraphicsLayout.py
+++ b/pyqtgraph/graphicsItems/GraphicsLayout.py
@@ -23,6 +23,7 @@ class GraphicsLayout(GraphicsWidget):
         self.setLayout(self.layout)
         self.items = {}  ## item: [(row, col), (row, col), ...]  lists all cells occupied by the item
         self.rows = {}   ## row: {col1: item1, col2: item2, ...}    maps cell location to item
+        self.itemBorders = {}  ## {item1: QtGui.QGraphicsRectItem, ...} border rects
         self.currentRow = 0
         self.currentCol = 0
         self.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
@@ -39,8 +40,10 @@ class GraphicsLayout(GraphicsWidget):
         See :func:`mkPen <pyqtgraph.mkPen>` for arguments.        
         """
         self.border = fn.mkPen(*args, **kwds)
-        self.update()
-    
+
+        for borderRect in self.itemBorders.values():
+            borderRect.setPen(self.border)
+
     def nextRow(self):
         """Advance to next row for automatic item placement"""
         self.currentRow += 1
@@ -119,7 +122,17 @@ class GraphicsLayout(GraphicsWidget):
                     self.rows[row2] = {}
                 self.rows[row2][col2] = item
                 self.items[item].append((row2, col2))
-        
+
+        borderRect = QtGui.QGraphicsRectItem()
+
+        borderRect.setParentItem(self)
+        borderRect.setZValue(1e3)
+        borderRect.setPen(fn.mkPen(self.border))
+
+        self.itemBorders[item] = borderRect
+
+        item.geometryChanged.connect(self._updateItemBorder)
+
         self.layout.addItem(item, row, col, rowspan, colspan)
         self.nextColumn()
 
@@ -129,15 +142,7 @@ class GraphicsLayout(GraphicsWidget):
 
     def boundingRect(self):
         return self.rect()
-        
-    def paint(self, p, *args):
-        if self.border is None:
-            return
-        p.setPen(fn.mkPen(self.border))
-        for i in self.items:
-            r = i.mapRectToParent(i.boundingRect())
-            p.drawRect(r)
-    
+
     def itemIndex(self, item):
         for i in range(self.layout.count()):
             if self.layout.itemAt(i).graphicsItem() is item:
@@ -150,13 +155,16 @@ class GraphicsLayout(GraphicsWidget):
         self.layout.removeAt(ind)
         self.scene().removeItem(item)
         
-        for r,c in self.items[item]:
+        for r, c in self.items[item]:
             del self.rows[r][c]
         del self.items[item]
+
+        item.geometryChanged.disconnect(self._updateItemBorder)
+        del self.itemBorders[item]
+
         self.update()
     
     def clear(self):
-        items = []
         for i in list(self.items.keys()):
             self.removeItem(i)
 
@@ -168,4 +176,14 @@ class GraphicsLayout(GraphicsWidget):
 
     def setSpacing(self, *args):
         self.layout.setSpacing(*args)
-    
\ No newline at end of file
+
+    def _updateItemBorder(self):
+        if self.border is None:
+            return
+
+        item = self.sender()
+        if item is None:
+            return
+
+        r = item.mapRectToParent(item.boundingRect())
+        self.itemBorders[item].setRect(r)