Enlarged clickable zones of lines

OpenPonk · Nov 6, 2024 · 905d94a · 905d94a
1 parent 2ce7bca
commit 905d94a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/repository/OpenPonk-Core/OPDiagram.class.st b/repository/OpenPonk-Core/OPDiagram.class.st
@@ -26,10 +26,9 @@ OPDiagram >> canvas: aCanvas [
 		self
 			assert: roassalShape canvas = aCanvas
 			description:
-			'Reusing same diagram element for 2 canvases not allowed'.
-		^ false ].
+			'Reusing same diagram element for 2 canvases not allowed' ].
 	roassalShape := aCanvas.
-	^ true
+	self updateRenderFromSelf
 ]
 
 { #category : 'accessing' }
@@ -89,10 +88,9 @@ OPDiagram >> name: anObject [
 ]
 
 { #category : 'as yet unclassified' }
-OPDiagram >> ownedElement: aShape renderedIn: aCanvas [
+OPDiagram >> ownedElement: aShape willRenderIn: aCanvas [
 
-	(self canvas: aCanvas) ifFalse: [ ^ self ].
-	self updateRenderFromSelf
+	self canvas: aCanvas
 ]
 
 { #category : 'rendering' }

diff --git a/repository/OpenPonk-Core/OPDiagramElement.class.st b/repository/OpenPonk-Core/OPDiagramElement.class.st
@@ -341,14 +341,19 @@ OPDiagramElement >> ownModelElement [
 
 { #category : 'initialization' }
 OPDiagramElement >> ownedElement: aShape renderedIn: aCanvas [
+	"do nothing"
+
+
+]
+
+{ #category : 'initialization' }
+OPDiagramElement >> ownedElement: aShape willRenderIn: aCanvas [
 
 	self isRendered ifTrue: [
 		self
 			assert: roassalShape canvas = aCanvas
 			description:
-			'Reusing same diagram element for 2 canvases not allowed'.
-		^ self owningElement ifExists: [ :owner |
-			  owner ownedElement: aShape renderedIn: aCanvas ] ].
+			'Reusing same diagram element for 2 canvases not allowed' ].
 	self renderIn: aCanvas
 ]
 
@@ -447,6 +452,7 @@ OPDiagramElement >> renderBasicShapeIn: aCanvas [
 OPDiagramElement >> renderIn: aCanvas [
 
 	self isRendered ifTrue: [ ^ self ].
+	self owningElement ownedElement: self willRenderIn: aCanvas.
 	self renderBasicShapeIn: aCanvas.
 	self renderShapeDetails.
 	self addInteractions.
@@ -455,8 +461,7 @@ OPDiagramElement >> renderIn: aCanvas [
 	self updateRenderFromModel.
 	self updateRenderFromStyles.
 	self updateRenderFromSelf.
-	self owningElement ifExists: [ :element |
-		element ownedElement: self renderedIn: self canvas ].
+	self owningElement ownedElement: self renderedIn: aCanvas.
 	^ roassalShape
 ]
 

diff --git a/repository/OpenPonk-Core/OPNoShape.class.st b/repository/OpenPonk-Core/OPNoShape.class.st
@@ -48,6 +48,20 @@ OPNoShape >> modelElement [
 	^ nil
 ]
 
+{ #category : 'initialization' }
+OPNoShape >> ownedElement: anOPPetriNetPTPlaceShape renderedIn: aRSCanvas [
+	"do nothing"
+
+
+]
+
+{ #category : 'initialization' }
+OPNoShape >> ownedElement: anOPPetriNetPTPlaceShape willRenderIn: aRSCanvas [
+	"do nothing"
+
+
+]
+
 { #category : 'accessing' }
 OPNoShape >> ownedElements [
 

diff --git a/repository/OpenPonk-Roassal/OPRSPolyline.class.st b/repository/OpenPonk-Roassal/OPRSPolyline.class.st
@@ -9,5 +9,5 @@ Class {
 { #category : 'as yet unclassified' }
 OPRSPolyline >> includedRadius [
 
-	^ super includedRadius + 2
+	^ super includedRadius + 1.5 + (2.5 / self canvas camera scale)
 ]