From 31e9e9c0c606e190e0f1b693a75d35c5a89b0c1d Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 2 Jun 2014 07:52:40 -0500 Subject: [PATCH] add setLabel and removeLabel. --- README.md | 2 ++ lib/widget.js | 56 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index bef35d2..91ebe84 100644 --- a/README.md +++ b/README.md @@ -363,6 +363,8 @@ The base element. - **setIndex(z)** - set the z-index of the element (changes rendering order). - **setFront()** - put the element in front of its siblings. - **setBack()** - put the element in back of its siblings. +- **setLabel(text)** - set the label text for the top-left corner. +- **removeLabel()** - remove the label completely. ###### Content Methods diff --git a/lib/widget.js b/lib/widget.js index e60e8a0..7b06fec 100644 --- a/lib/widget.js +++ b/lib/widget.js @@ -1802,21 +1802,7 @@ function Element(options) { this.setContent(options.content || '', true); if (options.label) { - this._label = new Box({ - screen: this.screen, - parent: this, - content: options.label, - left: 2, - top: this.border ? 0 : -1, - tags: this.parseTags, - shrink: true, - style: this.style.label, - fixed: true - }); - if (this.screen.autoPadding) { - this._label.rleft = -this.ileft + 2; - this._label.rtop = -this.itop; - } + this.setLabel(options.label); } // TODO: Possibly move this to Node for screen.on('mouse', ...). @@ -2360,6 +2346,37 @@ Element.prototype.clearPos = function(get) { lpos.yi, lpos.yl); }; +Element.prototype.setLabel = function(text) { + if (this._label) { + if (text) { + this._label.setContent(text); + } else { + this._label.detach(); + delete this._label; + } + return; + } + this._label = new Box({ + screen: this.screen, + parent: this, + content: text, + left: 2, + top: this.border ? 0 : -1, + tags: this.parseTags, + shrink: true, + style: this.style.label, + fixed: true + }); + if (this.screen.autoPadding) { + this._label.rleft = -this.ileft + 2; + this._label.rtop = -this.itop; + } +}; + +Element.prototype.removeLabel = function() { + return this.setLabel(null); +}; + /** * Positioning */ @@ -4333,7 +4350,12 @@ List.prototype.down = function(offset) { this.move(offset || 1); }; -List.prototype.pick = function(callback) { +List.prototype.pick = function(label, callback) { + if (!callback) { + callback = label; + label = null; + } + var self = this; var focused = this.screen.focused; if (focused && focused._done) focused._done('stop'); @@ -4346,8 +4368,10 @@ List.prototype.pick = function(callback) { this.focus(); this.show(); this.select(0); + if (label) this.setLabel(label); this.screen.render(); this.once('action', function(el, selected) { + if (label) self.removeLabel(); self.screen.restoreFocus(); self.hide(); self.screen.render();