Commits

Marko Toplak  committed 1865927 Draft

Correction of a previous merge.

  • Participants
  • Parent commits fd1bf1a

Comments (0)

Files changed (1)

File Orange/OrangeCanvas/canvas/items/nodeitem.py

 
         self.__fullStroke = None
         self.__dottedStroke = None
-<<<<<<< local
-        self.__mouseStroke = None
 
-    def boundingRect(self):
-        return self.__anchorPath.boundingRect().adjusted(-8,-5,8,5)
-=======
         self.__shape = None
->>>>>>> other
 
     def parentNodeItem(self):
         """Return a parent `NodeItem` or `None` if this anchor's
         stroke_path.setCapStyle(Qt.RoundCap)
 
         # Shape is wider (bigger mouse hit area - should be settable)
-        stroke_path.setWidth(9)
+        stroke_path.setWidth(15)
         self.__shape = stroke_path.createStroke(path)
 
         # The full stroke
         stroke_path.setWidth(3)
         self.__fullStroke = stroke_path.createStroke(path)
 
-        # For mouse detection
-        stroke_path.setWidth(15)
-        self.__mouseStroke = stroke_path.createStroke(path)
-
         # The dotted stroke (when not connected to anything)
-        stroke_path.setWidth(3)
         stroke_path.setDashPattern(Qt.DotLine)
         self.__dottedStroke = stroke_path.createStroke(path)
 
         return list(self.__pointPositions)
 
     def shape(self):
-<<<<<<< local
-        # use a thicker full stroke to enhance cursor collision
-        if self.__mouseStroke is not None:
-            return self.__mouseStroke
-=======
         if self.__shape is not None:
             return self.__shape
->>>>>>> other
         else:
             return GraphicsPathObject.shape(self)