InlineBox text offset improvements

YetiForceCompany · Apr 26, 2019 · a4629ea · a4629ea
1 parent c129d1c
commit a4629ea
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 5 deletions.
diff --git a/examples/H123456.html b/examples/H123456.html
@@ -4,3 +4,5 @@ <h3 style="border:1px solid red;">test</h3>
 <h4 style="border:1px solid red;">test</h4>
 <h5 style="border:1px solid red;">test</h5>
 <h6 style="border:1px solid red;">test</h6>
+
+<div style="line-height:4em;border:1px solid red;">test</div>
diff --git a/examples/H123456.pdf b/examples/H123456.pdf
diff --git a/examples/Image.pdf b/examples/Image.pdf
diff --git a/examples/InvoiceTable.pdf b/examples/InvoiceTable.pdf
diff --git a/examples/SimpleNestedDiv.pdf b/examples/SimpleNestedDiv.pdf
diff --git a/examples/SimpleTable.pdf b/examples/SimpleTable.pdf
diff --git a/examples/TableClassNames.pdf b/examples/TableClassNames.pdf
diff --git a/examples/WidthsSpecifiedTable.pdf b/examples/WidthsSpecifiedTable.pdf
diff --git a/examples/helloWorld.pdf b/examples/helloWorld.pdf
diff --git a/examples/nestedBlockPaddingWidth.pdf b/examples/nestedBlockPaddingWidth.pdf
diff --git a/examples/simpleInline.pdf b/examples/simpleInline.pdf
diff --git a/lib/Layout/InlineBox.php b/lib/Layout/InlineBox.php
@@ -186,7 +186,7 @@ public function createText($content, bool $sameId = false)
 	/**
 	 * Get previous sibling inline-level element text.
 	 *
-	 * @return string|null
+	 * @return null|string
 	 */
 	protected function getPreviousText()
 	{
@@ -302,11 +302,11 @@ public function measureOffset()
 		$top = $parent->getStyle()->getOffsetTop();
 		$lineHeight = $this->getClosestLineBox()->getDimensions()->getHeight();
 		if ($rules['vertical-align'] === 'bottom') {
-			$top = Math::sub($lineHeight, $this->getDimensions()->getHeight());
+			$top = Math::sub($lineHeight, $this->getStyle()->getFont()->getTextHeight());
 		} elseif ($rules['vertical-align'] === 'top') {
-			$top = '0';
+			$top = $this->getStyle()->getFont()->getDescender();
 		} elseif ($rules['vertical-align'] === 'middle' || $rules['vertical-align'] === 'baseline') {
-			$height = $this->getDimensions()->getHeight();
+			$height = $this->getStyle()->getFont()->getTextHeight();
 			$top = Math::sub(Math::div($lineHeight, '2'), Math::div($height, '2'));
 		}
 		// margin top inside inline and inline block doesn't affect relative to line top position

diff --git a/lib/Objects/Font.php b/lib/Objects/Font.php
@@ -463,7 +463,7 @@ public function getTextWidth(string $text): string
 	public function getTextHeight(string $text = null): string
 	{
 		if ($this->textHeight === null) {
-			$this->textHeight = Math::div(Math::mul($this->size->getConverted(), $this->height), $this->unitsPerEm);
+			$this->textHeight = Math::add($this->getAscender(), Math::mul($this->getDescender(), '-1'));
 		}
 
 		return $this->textHeight;