luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

consider edges close to collapsing edge as being on it

Browse source
This commit is contained in:
Gavin Nishizawa 2023-07-19 19:22:37 -07:00
parent 1eb3999c99
commit a18eae7158
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2layouts/d2dagrelayout/layout.go
View file

@ -1723,30 +1723,26 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori
if !isOnSide { if !isOnSide {
return false return false
} }
buffer := 10.
var isInRange bool var isInRange bool
if delta > 0 { if delta > 0 {
if objPosition < position && position < objPosition+delta { if objPosition <= position && position <= objPosition+delta+buffer {
isInRange = true isInRange = true
} }
} else { } else {
if objPosition+delta < position && position < objPosition { if objPosition+delta-buffer <= position && position <= objPosition {
isInRange = true isInRange = true
} }
} }
if !isInRange { return isInRange
if isHorizontal {
return false
} else {
return false
}
}
return true
} }
hasEdgeOnCollapsingSide := false
outermost := objPosition + delta outermost := objPosition + delta
for _, edge := range obj.Graph.Edges { for _, edge := range obj.Graph.Edges {
if edge.Src == obj { if edge.Src == obj {
p := edge.Route[0] p := edge.Route[0]
if isOnCollapsingSide(p) { if isOnCollapsingSide(p) {
hasEdgeOnCollapsingSide = true
var position float64 var position float64
if isHorizontal { if isHorizontal {
position = p.X position = p.X
@ -1763,6 +1759,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori
if edge.Dst == obj { if edge.Dst == obj {
p := edge.Route[len(edge.Route)-1] p := edge.Route[len(edge.Route)-1]
if isOnCollapsingSide(p) { if isOnCollapsingSide(p) {
hasEdgeOnCollapsingSide = true
var position float64 var position float64
if isHorizontal { if isHorizontal {
position = p.X position = p.X
@ -1778,7 +1775,7 @@ func adjustDeltaForEdges(obj *d2graph.Object, objPosition, delta float64, isHori
} }
} }
newMagnitude = math.Abs(delta) newMagnitude = math.Abs(delta)
if outermost != objPosition+delta { if hasEdgeOnCollapsingSide {
// only reduce to outermost + DEFAULT_PADDING // only reduce to outermost + DEFAULT_PADDING
if delta < 0 { if delta < 0 {
newMagnitude = math.Max(0, objPosition-(outermost+DEFAULT_PADDING)) newMagnitude = math.Max(0, objPosition-(outermost+DEFAULT_PADDING))