From 991dc5efa63ebb7a5e2f1bfe4b1afb1f58e8e324 Mon Sep 17 00:00:00 2001
From: Martin Dias <tinchodias@gmail.com>
Date: Wed, 4 Sep 2024 19:18:03 -0400
Subject: [PATCH 1/2] Do not consider that the AeCanvas has default dash array
 set

Regression test PNG incoming in next commit
---
 .../BlSpaceFixture.class.st                   | 35 +++++++++++++++++++
 src/Bloc-Alexandrie/BlBorder.extension.st     |  6 ++--
 .../BlTextBorderAttribute.extension.st        |  7 ++--
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/Bloc-Alexandrie-Tests/BlSpaceFixture.class.st b/src/Bloc-Alexandrie-Tests/BlSpaceFixture.class.st
index f41fa97e9..9bb52813c 100644
--- a/src/Bloc-Alexandrie-Tests/BlSpaceFixture.class.st
+++ b/src/Bloc-Alexandrie-Tests/BlSpaceFixture.class.st
@@ -114,6 +114,41 @@ BlSpaceFixture >> buildCapRoundDashedBorderOnClosedGeometry [
 
 ]
 
+{ #category : #fixtures }
+BlSpaceFixture >> buildChildDoesntInheritDashedBorder [
+
+	| outskirts |
+	builder spaceExtent: 90 @ 50.
+	builder space root layout: BlFlowLayout horizontal.
+
+	outskirts := {
+		BlOutskirts centered.
+		BlOutskirts inside.
+		BlOutskirts outside }.
+
+	#(true false) do: [ :childHasBorder |
+		outskirts do: [ :eachOutskirt |
+			| parent child |
+			parent := builder addToRoot
+				size: 25 @ 20;
+				margin: (BlInsets all: 2.5);
+				outskirts: eachOutskirt;
+				layout: BlFrameLayout new;
+				border: (BlBorder builder
+					paint: Color blue;
+					width: 2;
+					dashArray: #(2 2);
+					build).
+			child := (builder addTo: parent)
+				size: 12 asPoint;
+				constraintsDo: [ :c |
+					c frame horizontal alignCenter.
+					c frame vertical alignCenter ].
+			childHasBorder ifTrue: [
+				child border: (BlBorder paint: Color white width: 4) ] ] ]
+
+]
+
 { #category : #fixtures }
 BlSpaceFixture >> buildClippingAbsolutelyTransparentElement [
 	"Add 3 elements, where only the last one should be clipped by it's transparent parent.
diff --git a/src/Bloc-Alexandrie/BlBorder.extension.st b/src/Bloc-Alexandrie/BlBorder.extension.st
index 3e4148356..5076a02ca 100644
--- a/src/Bloc-Alexandrie/BlBorder.extension.st
+++ b/src/Bloc-Alexandrie/BlBorder.extension.st
@@ -20,9 +20,9 @@ BlBorder >> aeApplyTo: aeCanvas element: aBlElement [
 	aeCanvas setBorderBlock: [
 		paint aeApplyTo: aeCanvas.
 
-		"No dashes is the default"
-		style dashArray ifNotEmpty: [ :da |
-			aeCanvas setDashes: da offset: style dashOffset ].
+		aeCanvas
+			setDashes: style dashArray
+			offset: style dashOffset.
 
 		aBlElement geometry hasJoins ifTrue: [
 			style lineJoin
diff --git a/src/Bloc-Alexandrie/BlTextBorderAttribute.extension.st b/src/Bloc-Alexandrie/BlTextBorderAttribute.extension.st
index 5192ed247..893b50e97 100644
--- a/src/Bloc-Alexandrie/BlTextBorderAttribute.extension.st
+++ b/src/Bloc-Alexandrie/BlTextBorderAttribute.extension.st
@@ -28,10 +28,9 @@ BlTextBorderAttribute >> aeDrawOn: aeCanvas span: aBASpan [
 			aeCanvas setBorderBlock: [
 				border paint aeApplyTo: aeCanvas.
 
-				border style dashArray ifNotEmpty: [ :da |
-					aeCanvas
-						setDashes: da
-						offset: border style dashOffset ].
+				aeCanvas
+					setDashes: border style dashArray
+					offset: border style dashOffset.
 
 				border style lineJoin
 					aeApplyTo: aeCanvas

From fd95f9c324dfc863e87d0bf53cfaea48f631570b Mon Sep 17 00:00:00 2001
From: Martin Dias <tinchodias@gmail.com>
Date: Wed, 4 Sep 2024 19:22:03 -0400
Subject: [PATCH 2/2] Add PNGs for regression tests

---
 .../hit/buildChildDoesntInheritDashedBorder.png  | Bin 0 -> 274 bytes
 .../buildChildDoesntInheritDashedBorder.png      | Bin 0 -> 1116 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/hit/buildChildDoesntInheritDashedBorder.png
 create mode 100644 tests/render/buildChildDoesntInheritDashedBorder.png

diff --git a/tests/hit/buildChildDoesntInheritDashedBorder.png b/tests/hit/buildChildDoesntInheritDashedBorder.png
new file mode 100644
index 0000000000000000000000000000000000000000..13e30a382ba1f458d8b7577d8f4c3b8fca215389
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^Q9x|O!3HGn@SiaSQa3$a978JNp58po$)L!?a$&8a
z>a8TMJLm6uA6RojddB7tdXFl8{xsY^|J#oX)(eam?cMyO<D1|4vl;98-#Y)kU{_*Z
zk}_=<mz5icQ1bq|ur@>fR{J+h>X%MNeaNTl)?nH1&c8p_AFR!=x7)&h*17-tv^Vc`
zKJGm>%i6wt%XNtEU9!JoS9ry;%)M_E_Co7LPZTbLZ?)U;+>)RA=j%C;#usld)cuM7
c@c1(W<2`xiH`!9zKu<Dwy85}Sb4q9e045uQyZ`_I

literal 0
HcmV?d00001

diff --git a/tests/render/buildChildDoesntInheritDashedBorder.png b/tests/render/buildChildDoesntInheritDashedBorder.png
new file mode 100644
index 0000000000000000000000000000000000000000..435d77a9db1ee5c3a67eb4c363d97b167432fc4c
GIT binary patch
literal 1116
zcmV-i1f%<jP)<h;3K|Lk000e1NJLTq003G5001%w1^@s6+z-q(000CdNkl<ZcwXh2
zO-NKx6vu~%5I1f7fHqm!rjjBs+DTMGZrt=?E{dW8wXqUw;UWo(OgCjSlD04+kjy?T
zhwM{o2xiO}h$0X%1j|i}ED$8=#{bG4=iN7Nocre7nW=l>aOVun+~Ifs_y69U^E`~1
zHHL>7Yi?c$ypDZOSB~My<l>na_zfP<Lg01md%E%{=-9=NZhy@}EiHW3k;g8M(f#5R
zt33CX$LYa-=KJ2kXUcqJHe>_6cjq*_dpW}1-HGtIy(U7QUu>L?ipv7Jc-b4~T~W?D
za&q{*d-(;@9I$0YSDXz;H#y(i!Pbwh<1=Lr*s^s1#`QftS_80!xT4kp2m*?(fU@Nw
zK<93G&sN_&#KB<BJKmLY4$uXS?OfUNfbw*M#%5X+jR6QcAv-DBd+&h-5@iTwV>2_M
zXl$nKVwgzLp@(fs5$`)-Bk?>M$Jz;$f8x1P$e$O=#%9VMjbrTuXy8UrDUw#SSR63o
zK~fzmipH_V@h<AEvVl?^P8+7`(W-;YqbWcy<<a88MF|?4=f<O{Kr4H+PDLm3=u|<w
z^=K;4${sC`(D+qLBm>%wN6Vu#GG&RSK)dy5+q&&fEa6(wsvdo1XsspE<<T2^LY7FE
zN0$`VTOw^9?FKZ3N2`LS@@Ti9Q}$>|MXPwUDrhQ?b_?2kkN#IY+Wh-y^Y5e0zmGQm
zKHB_RNA}b@bXM;Yc{Ej+UyqhNT6n5}PL*d>J-YMAE%J^^vK<yt^r!BuWMw^i+vXn`
z=^6S4KXVVo@y5KXev~}N8nQ>DpQo!=DDuE<sb^?f7rd-&@%N;w8}4BSKG%^hF~#Oa
zf;RsF8j~KNsopow2K(putRt5%hC|&`tf_L0$Nh#doAN*9Gi5$AGHwH1Q8UT>AA&6K
zGsx#NkAmcRQ`cntKP;;X=2_*ASyo&9i_fJcbEG+7%ZhHO7+-u!D*qV^Z)oH*We(V~
zbpS@)w^pqI*tS0`fFPjg3MgA10`#WbFYH=T7YBp+VBV{gbAYZZ3~*)31Ip748k=dm
z7y^P$$WDsx^^RH~QHD@9HZv27#%9_shKUs2cI=~4#QP4|NIZ|mv33G=;=p62kUuY!
zjm?xj8pqlR(BYS-lp<+Gi^TyW9;CjL0i{q;G>$cnclR2<4b;lk8KrRAFjbGP^6gg&
zGLNPJy_83b3l}A5Y@QpBrUI?((K;2K$fHvQ?bf5IKr4GR1!y-OohoRz9<5E$=6kgH
z9&NryoA1%)d$jo;ZN5jF@6qOav{4>yeyt--wGN%tyF?yM73SBYC65-KDxg#4Syhj|
zbpAJaM<v+~izxb2cUH2p9=)~nPeyu%1HP}^Lvg$@*OpI^=U7AbX!P@R^$JDa7oIf#
i0UGlkp!rW9p!o|uAW4n-PngsI0000<MNUMnLSTZMFdj?*

literal 0
HcmV?d00001