zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-07-27 21:16:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed fill character

Browse source
This commit is contained in:
Nathan Byrd 2022-01-19 15:11:33 -06:00
parent c82497b75e
commit c4ed09a8bb
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/full_menu_view.js
View file

@ -59,8 +59,9 @@ function FullMenuView(options) {
this.clearPage = function() { this.clearPage = function() {
console.log("Clear page called with f: ~%s~, h: %d, w: %d, r: %d, c: %d", this.fillChar, this.dimens.height, this.dimens.width, this.position.row, this.position.col);
for (var i = 0; i < this.dimens.height; i++) { for (var i = 0; i < this.dimens.height; i++) {
let text = `${strUtil.pad(' ', this.dimens.width, this.fillChar, 'left')}`; let text = `${strUtil.pad(this.fillChar, this.dimens.width, this.fillChar, 'left')}`;
self.client.term.write(`${ansi.goto(this.position.row + i, this.position.col)}${text}`); self.client.term.write(`${ansi.goto(this.position.row + i, this.position.col)}${text}`);
} }
} }
@ -184,7 +185,7 @@ function FullMenuView(options) {
} }
// increment the column // increment the column
col += maxLength + spacer.length + 1; col += maxLength + spacer.length;
itemInCol++; itemInCol++;
} }
@ -231,8 +232,9 @@ function FullMenuView(options) {
let padLength = Math.min(item.fixedLength + 1, this.dimens.width); let padLength = Math.min(item.fixedLength + 1, this.dimens.width);
text = `${sgr}${strUtil.pad(text, padLength, this.fillChar, this.justify)}`; text = `${sgr}${strUtil.pad(text, padLength, this.fillChar, this.justify)}${this.getSGR()}`;
this.client.term.write(`${ansi.goto(item.row, item.col)}${text}`); this.client.term.write(`${ansi.goto(item.row, item.col)}${text}`);
// this.client.term.write(`${ansi.goto(item.row, item.col)}${text}${this.getSpacer()}`);
this.setRenderCacheItem(index, text, item.focused); this.setRenderCacheItem(index, text, item.focused);
}; };
} }
@ -275,6 +277,7 @@ FullMenuView.prototype.setHeight = function(height) {
this.positionCacheExpired = true; this.positionCacheExpired = true;
this.autoAdjustHeight = false; this.autoAdjustHeight = false;
this.clearPage();
}; };
FullMenuView.prototype.setWidth = function(width) { FullMenuView.prototype.setWidth = function(width) {
@ -296,6 +299,13 @@ FullMenuView.prototype.setPosition = function(pos) {
this.positionCacheExpired = true; this.positionCacheExpired = true;
}; };
FullMenuView.prototype.setFillChar = function(fillChar) {
FullMenuView.super_.prototype.setFillChar.call(this, fillChar);
this.clearPage();
this.redraw();
};
FullMenuView.prototype.setFocus = function(focused) { FullMenuView.prototype.setFocus = function(focused) {
FullMenuView.super_.prototype.setFocus.call(this, focused); FullMenuView.super_.prototype.setFocus.call(this, focused);
@ -354,6 +364,7 @@ FullMenuView.prototype.removeItem = function(index) {
} }
FullMenuView.super_.prototype.removeItem.call(this, index); FullMenuView.super_.prototype.removeItem.call(this, index);
this.positionCacheExpired = true;
}; };
// :TODO: Apply draw optimizaitons when only two items need drawn vs entire view! // :TODO: Apply draw optimizaitons when only two items need drawn vs entire view!

8
core/menu_view.js
View file

@ -263,7 +263,7 @@ MenuView.prototype.setItemSpacing = function(itemSpacing) {
}; };
MenuView.prototype.setItemHorizSpacing = function(itemHorizSpacing) { MenuView.prototype.setItemHorizSpacing = function(itemHorizSpacing) {
itemSpacing = parseInt(itemHorizSpacing); itemHorizSpacing = parseInt(itemHorizSpacing);
assert(_.isNumber(itemHorizSpacing)); assert(_.isNumber(itemHorizSpacing));
this.itemHorizSpacing = itemHorizSpacing; this.itemHorizSpacing = itemHorizSpacing;
@ -280,6 +280,7 @@ MenuView.prototype.setPropertyValue = function(propName, value) {
case 'textOverflow': this.setTextOverflow(value); break; case 'textOverflow': this.setTextOverflow(value); break;
case 'hotKeySubmit': this.hotKeySubmit = value; break; case 'hotKeySubmit': this.hotKeySubmit = value; break;
case 'justify': this.setJustify(value); break; case 'justify': this.setJustify(value); break;
case 'fillChar': this.setFillChar(value); break;
case 'focusItemIndex': this.focusedItemIndex = value; break; case 'focusItemIndex': this.focusedItemIndex = value; break;
case 'itemFormat': case 'itemFormat':
@ -295,6 +296,11 @@ MenuView.prototype.setPropertyValue = function(propName, value) {
MenuView.super_.prototype.setPropertyValue.call(this, propName, value); MenuView.super_.prototype.setPropertyValue.call(this, propName, value);
}; };
MenuView.prototype.setFillChar = function(fillChar) {
this.fillChar = miscUtil.valueWithDefault(fillChar, ' ').substr(0, 1);
this.invalidateRenderCache();
}
MenuView.prototype.setJustify = function(justify) { MenuView.prototype.setJustify = function(justify) {
this.justify = justify; this.justify = justify;
this.invalidateRenderCache(); this.invalidateRenderCache();