build highlighting for ghost elements, minor refactoring (area9innova…

…tion#215)
lineCode · May 6, 2019 · 1f7afb4 · 1f7afb4
1 parent 9b19178
commit 1f7afb4
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/form/paragraph3.flow b/lib/form/paragraph3.flow
@@ -665,15 +665,15 @@ RenderLine(
 			Ghost(xc, yc, fm): {
 				nextDistinct(xc, ^alignmentOffset);
 				nextDistinct(yc, y + dy);
-				None();
+				Some(applyStylesAndOffset(Empty()));
 			}
 			InspectGhost(xc, yc, wh, lh, ln,  fm): {
 				nextDistinct(xc, ^alignmentOffset);
 				nextDistinct(yc, y + dy);
 				nextDistinct(wh, WidthHeight(m.width, m.height));
 				nextDistinct(lh, lineHeight);
 				nextDistinct(ln, lineNumber);
-				None();
+				Some(applyStylesAndOffset(Empty()));
 			}
 			CoordinateInspectElement(in, xc, yc, wh, lh, fm): {
 				fo = applyStylesAndOffset(fm);
@@ -701,7 +701,6 @@ applyIntStylesAndHighlighting(
 	height : double,
 	interWord : double,
 ) -> Form {
-
 	getStyleForBackgroundFromCharStyle = \s -> eitherMap(
 		tryExtractStruct(s, BackgroundFill(white)),
 		\backFill -> [
@@ -714,7 +713,10 @@ applyIntStylesAndHighlighting(
 	makeBackRect = \defStyle, dynStyle -> Rectangle(
 		width + interWord,
 		height,
-		replaceStructMany(defStyle, getStyleForBackgroundFromCharStyle(dynStyle))
+		replaceStructMany(
+			getStyleForBackgroundFromCharStyle(defStyle),
+			getStyleForBackgroundFromCharStyle(dynStyle)
+		)
 	);
 
 	dynamicCharStyleBM = tryExtractStruct(styles, DynamicCharStyle(make([])));
@@ -730,16 +732,15 @@ applyIntStylesAndHighlighting(
 				)
 			);
 
-			defBackStyle = getStyleForBackgroundFromCharStyle(txtStyle);
 			// We draw custom highlighting to fix gaps for cases of justifying alignment
 			// And to have more straight and pretty highlighting.
 			eitherMap(
 				dynamicCharStyleBM,
 				\dynCharStyle -> Pair(
 					Select(dynCharStyle.styleB, \chStyle -> makeTxt(chStyle)),
-					Select(dynCharStyle.styleB, \chStyle -> makeBackRect(defBackStyle, chStyle))
+					Select(dynCharStyle.styleB, \chStyle -> makeBackRect(txtStyle, chStyle))
 				),
-				Pair(makeTxt([]), makeBackRect(defBackStyle, []))
+				Pair(makeTxt([]), makeBackRect(txtStyle, []))
 			)
 		}
 		default : Pair(