From 9cff0eeaa6133c934f54779314ed826df231ba87 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 3 Feb 2025 16:50:27 -0700 Subject: [PATCH] ta --- d2layouts/d2near/layout.go | 11 +- .../txtar/elk-title-near/elk/board.exp.json | 4 +- .../txtar/elk-title-near/elk/sketch.exp.svg | 162 +++++++++--------- 3 files changed, 90 insertions(+), 87 deletions(-) diff --git a/d2layouts/d2near/layout.go b/d2layouts/d2near/layout.go index eedecd40d..a08b43ff3 100644 --- a/d2layouts/d2near/layout.go +++ b/d2layouts/d2near/layout.go @@ -191,12 +191,15 @@ func boundingBox(g *d2graph.Graph) (tl, br *geo.Point) { } for _, edge := range g.Edges { + if edge.Src.OuterNearContainer() != nil || edge.Dst.OuterNearContainer() != nil { + continue + } if edge.Route != nil { for _, point := range edge.Route { - x1 = math.Min(x1, point.X-pad/2) - y1 = math.Min(y1, point.Y-pad/2) - x2 = math.Max(x2, point.X+pad/2) - y2 = math.Max(y2, point.Y+pad/2) + x1 = math.Min(x1, point.X) + y1 = math.Min(y1, point.Y) + x2 = math.Max(x2, point.X) + y2 = math.Max(y2, point.Y) } } } diff --git a/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json b/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json index dc901df0c..bcfd342a9 100644 --- a/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json +++ b/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json @@ -15,8 +15,8 @@ "id": "title", "type": "rectangle", "pos": { - "x": -100, - "y": -84 + "x": -95, + "y": -74 }, "width": 408, "height": 66, diff --git a/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg b/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg index 9b5c267d3..d1e841ac6 100644 --- a/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -diagram title : Red-line hits 'near: top-center' in elkababc - - + .d2-1173681419 .fill-N1{fill:#0A0F25;} + .d2-1173681419 .fill-N2{fill:#676C7E;} + .d2-1173681419 .fill-N3{fill:#9499AB;} + .d2-1173681419 .fill-N4{fill:#CFD2DD;} + .d2-1173681419 .fill-N5{fill:#DEE1EB;} + .d2-1173681419 .fill-N6{fill:#EEF1F8;} + .d2-1173681419 .fill-N7{fill:#FFFFFF;} + .d2-1173681419 .fill-B1{fill:#0D32B2;} + .d2-1173681419 .fill-B2{fill:#0D32B2;} + .d2-1173681419 .fill-B3{fill:#E3E9FD;} + .d2-1173681419 .fill-B4{fill:#E3E9FD;} + .d2-1173681419 .fill-B5{fill:#EDF0FD;} + .d2-1173681419 .fill-B6{fill:#F7F8FE;} + .d2-1173681419 .fill-AA2{fill:#4A6FF3;} + .d2-1173681419 .fill-AA4{fill:#EDF0FD;} + .d2-1173681419 .fill-AA5{fill:#F7F8FE;} + .d2-1173681419 .fill-AB4{fill:#EDF0FD;} + .d2-1173681419 .fill-AB5{fill:#F7F8FE;} + .d2-1173681419 .stroke-N1{stroke:#0A0F25;} + .d2-1173681419 .stroke-N2{stroke:#676C7E;} + .d2-1173681419 .stroke-N3{stroke:#9499AB;} + .d2-1173681419 .stroke-N4{stroke:#CFD2DD;} + .d2-1173681419 .stroke-N5{stroke:#DEE1EB;} + .d2-1173681419 .stroke-N6{stroke:#EEF1F8;} + .d2-1173681419 .stroke-N7{stroke:#FFFFFF;} + .d2-1173681419 .stroke-B1{stroke:#0D32B2;} + .d2-1173681419 .stroke-B2{stroke:#0D32B2;} + .d2-1173681419 .stroke-B3{stroke:#E3E9FD;} + .d2-1173681419 .stroke-B4{stroke:#E3E9FD;} + .d2-1173681419 .stroke-B5{stroke:#EDF0FD;} + .d2-1173681419 .stroke-B6{stroke:#F7F8FE;} + .d2-1173681419 .stroke-AA2{stroke:#4A6FF3;} + .d2-1173681419 .stroke-AA4{stroke:#EDF0FD;} + .d2-1173681419 .stroke-AA5{stroke:#F7F8FE;} + .d2-1173681419 .stroke-AB4{stroke:#EDF0FD;} + .d2-1173681419 .stroke-AB5{stroke:#F7F8FE;} + .d2-1173681419 .background-color-N1{background-color:#0A0F25;} + .d2-1173681419 .background-color-N2{background-color:#676C7E;} + .d2-1173681419 .background-color-N3{background-color:#9499AB;} + .d2-1173681419 .background-color-N4{background-color:#CFD2DD;} + .d2-1173681419 .background-color-N5{background-color:#DEE1EB;} + .d2-1173681419 .background-color-N6{background-color:#EEF1F8;} + .d2-1173681419 .background-color-N7{background-color:#FFFFFF;} + .d2-1173681419 .background-color-B1{background-color:#0D32B2;} + .d2-1173681419 .background-color-B2{background-color:#0D32B2;} + .d2-1173681419 .background-color-B3{background-color:#E3E9FD;} + .d2-1173681419 .background-color-B4{background-color:#E3E9FD;} + .d2-1173681419 .background-color-B5{background-color:#EDF0FD;} + .d2-1173681419 .background-color-B6{background-color:#F7F8FE;} + .d2-1173681419 .background-color-AA2{background-color:#4A6FF3;} + .d2-1173681419 .background-color-AA4{background-color:#EDF0FD;} + .d2-1173681419 .background-color-AA5{background-color:#F7F8FE;} + .d2-1173681419 .background-color-AB4{background-color:#EDF0FD;} + .d2-1173681419 .background-color-AB5{background-color:#F7F8FE;} + .d2-1173681419 .color-N1{color:#0A0F25;} + .d2-1173681419 .color-N2{color:#676C7E;} + .d2-1173681419 .color-N3{color:#9499AB;} + .d2-1173681419 .color-N4{color:#CFD2DD;} + .d2-1173681419 .color-N5{color:#DEE1EB;} + .d2-1173681419 .color-N6{color:#EEF1F8;} + .d2-1173681419 .color-N7{color:#FFFFFF;} + .d2-1173681419 .color-B1{color:#0D32B2;} + .d2-1173681419 .color-B2{color:#0D32B2;} + .d2-1173681419 .color-B3{color:#E3E9FD;} + .d2-1173681419 .color-B4{color:#E3E9FD;} + .d2-1173681419 .color-B5{color:#EDF0FD;} + .d2-1173681419 .color-B6{color:#F7F8FE;} + .d2-1173681419 .color-AA2{color:#4A6FF3;} + .d2-1173681419 .color-AA4{color:#EDF0FD;} + .d2-1173681419 .color-AA5{color:#F7F8FE;} + .d2-1173681419 .color-AB4{color:#EDF0FD;} + .d2-1173681419 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1173681419);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1173681419);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1173681419);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1173681419);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1173681419);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1173681419);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1173681419);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1173681419);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>diagram title : Red-line hits 'near: top-center' in elkababc + +