From a162f6e49f9205cb187f856fbd318394b20aa717 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Wed, 6 Mar 2019 14:17:07 -0800
Subject: [PATCH] fixed text background positioning
---
src/mol-geo/geometry/text/text-builder.ts | 24 ++++++++++++-----------
src/tests/browser/render-text.ts | 3 ++-
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/mol-geo/geometry/text/text-builder.ts b/src/mol-geo/geometry/text/text-builder.ts
index 622043cb7..caa3d299e 100644
--- a/src/mol-geo/geometry/text/text-builder.ts
+++ b/src/mol-geo/geometry/text/text-builder.ts
@@ -40,38 +40,40 @@ export namespace TextBuilder {
return {
add: (str: string, x: number, y: number, z: number, depth: number, group: number) => {
- let xadvance = 0
+ let bWidth = 0
const nChar = str.length
// calculate width
for (let iChar = 0; iChar < nChar; ++iChar) {
const c = fontAtlas.get(str[iChar])
- xadvance += c.nw - 2 * outline
+ bWidth += c.nw - 2 * outline
}
+ const bHeight = 1 / 1.25
+
// attachment
let yShift: number, xShift: number
if (attachment.startsWith('top')) {
- yShift = 1 / 1.25
+ yShift = bHeight
} else if (attachment.startsWith('middle')) {
- yShift = 1 / 2.5
+ yShift = bHeight / 2
} else {
yShift = 0 // "bottom"
}
if (attachment.endsWith('right')) {
- xShift = xadvance
+ xShift = bWidth
} else if (attachment.endsWith('center')) {
- xShift = xadvance / 2
+ xShift = bWidth / 2
} else {
xShift = 0 // "left"
}
// background
if (background) {
- ChunkedArray.add2(mappings, -xadvance + xShift - margin - 0.1, yShift + margin) // top left
- ChunkedArray.add2(mappings, -xadvance + xShift - margin - 0.1, -yShift - margin) // bottom left
- ChunkedArray.add2(mappings, xadvance - xShift + margin + 0.1, yShift + margin) // top right
- ChunkedArray.add2(mappings, xadvance - xShift + margin + 0.1, -yShift - margin) // bottom right
+ ChunkedArray.add2(mappings, -xShift - margin - 0.1, bHeight - yShift + margin) // top left
+ ChunkedArray.add2(mappings, -xShift - margin - 0.1, -yShift - margin) // bottom left
+ ChunkedArray.add2(mappings, bWidth - xShift + margin + 0.1, bHeight - yShift + margin) // top right
+ ChunkedArray.add2(mappings, bWidth - xShift + margin + 0.1, -yShift - margin) // bottom right
const offset = centers.elementCount
for (let i = 0; i < 4; ++i) {
@@ -86,7 +88,7 @@ export namespace TextBuilder {
xShift += outline
yShift += outline
- xadvance = 0
+ let xadvance = 0
for (let iChar = 0; iChar < nChar; ++iChar) {
const c = fontAtlas.get(str[iChar])
diff --git a/src/tests/browser/render-text.ts b/src/tests/browser/render-text.ts
index 4eca7abaa..e59462bad 100644
--- a/src/tests/browser/render-text.ts
+++ b/src/tests/browser/render-text.ts
@@ -33,7 +33,8 @@ function textRepr() {
attachment: 'middle-center',
fontQuality: 3,
fontWeight: 'normal',
- borderWidth: 0.3
+ borderWidth: 0.3,
+ background: true
}
const textBuilder = TextBuilder.create(props, 1, 1)
--
GitLab