diff options
author | Florrie <towerofnix@gmail.com> | 2018-12-05 16:54:10 -0400 |
---|---|---|
committer | Florrie <towerofnix@gmail.com> | 2018-12-05 16:54:10 -0400 |
commit | ab193ed3fe91078551c0020e681a191e7b26a122 (patch) | |
tree | 9167ab573f8f82399cb238ce95c8c9c9b541083f /ui | |
parent | d59d12196ad00a51d76e0ef4b6808ec2978f7649 (diff) |
Use measureColumns in the appropriate places
TL;DR If you want to take into account the width of text, use measureColumns instead of just checking the length of the text!
Diffstat (limited to 'ui')
-rw-r--r-- | ui/Label.js | 2 | ||||
-rw-r--r-- | ui/Pane.js | 2 | ||||
-rw-r--r-- | ui/Sprite.js | 2 | ||||
-rw-r--r-- | ui/form/Button.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/Label.js b/ui/Label.js index faeee98..e320574 100644 --- a/ui/Label.js +++ b/ui/Label.js @@ -13,7 +13,7 @@ module.exports = class Label extends DisplayElement { } fixLayout() { - this.w = this.text.length + this.w = ansi.measureColumns(this.text) } drawTo(writable) { diff --git a/ui/Pane.js b/ui/Pane.js index 4e08c55..b33a1b7 100644 --- a/ui/Pane.js +++ b/ui/Pane.js @@ -86,7 +86,7 @@ module.exports = class Pane extends DisplayElement { const pane = new Pane() pane.frameColor = ansi.C_WHITE - pane.w = text.length + 2 + pane.w = ansi.measureColumns(text) + 2 pane.h = 3 parent.addChild(pane) diff --git a/ui/Sprite.js b/ui/Sprite.js index 62b0172..701f1b8 100644 --- a/ui/Sprite.js +++ b/ui/Sprite.js @@ -60,7 +60,7 @@ module.exports = class Sprite extends DisplayElement { } get textureWidth() { - return Math.max(...this.texture.map(row => row.length)) + return Math.max(...this.texture.map(row => ansi.measureColumns(row))) } get textureHeight() { diff --git a/ui/form/Button.js b/ui/form/Button.js index 1f1c537..3a35912 100644 --- a/ui/form/Button.js +++ b/ui/form/Button.js @@ -16,7 +16,7 @@ module.exports = class Button extends FocusElement { } fixLayout() { - this.w = this.text.length + this.w = ansi.measureColumns(this.text) this.h = 1 } |