From 1606437c272d52674b464f6de97778b2d237b457 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 30 Jun 2015 23:09:58 -0600
Subject: [PATCH] * Minor updates to HorizontalMenuView (WIP)

---
 core/horizontal_menu_view.js | 17 ++++++++++++++---
 mods/menu.json               |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/horizontal_menu_view.js b/core/horizontal_menu_view.js
index f029b3b5..281c85b9 100644
--- a/core/horizontal_menu_view.js
+++ b/core/horizontal_menu_view.js
@@ -6,12 +6,17 @@ var ansi			= require('./ansi_term.js');
 var strUtil			= require('./string_util.js');
 
 var assert			= require('assert');
+var _				= require('lodash');
 
 exports.HorizontalMenuView		= HorizontalMenuView;
 
 function HorizontalMenuView(options) {
 	options.cursor	= options.cursor || 'hide';
 
+	if(!_.isNumber(options.itemSpacing)) {
+		options.itemSpacing = 1;
+	}
+
 	MenuView.call(this, options);
 
 	this.dimens.height = 1;	//	always the case
@@ -19,7 +24,7 @@ function HorizontalMenuView(options) {
 	var self = this;
 
 	this.getSpacer = function() {
-		return new Array(self.itemSpacing).join(' ');
+		return new Array(self.itemSpacing + 1).join(' ');
 	}
 
 	this.performAutoScale = function() {
@@ -56,14 +61,20 @@ function HorizontalMenuView(options) {
 			return;
 		}
 
-		self.client.term.write(ansi.goto(item.row, self.itemColumns[index]));
+		//self.client.term.write(ansi.goto(item.row, self.itemColumns[index]));
 		self.client.term.write(index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR());
 
 		var text = strUtil.stylizeString(item.text, item.focused ? self.focusTextStyle : self.textStyle);
 
 		var extraPad = self.getSpacer().length * 2;
+		var spacer = self.getSpacer();
+
 		self.client.term.write(
-			strUtil.pad(text, text.length + extraPad, this.fillChar, 'center'));
+			ansi.goto(self.position.row, self.itemColumns[index]) +
+			(index === self.focusedItemIndex ? self.getFocusSGR() : self.getSGR()) +
+			strUtil.pad(text, text.length + extraPad, self.fillChar, 'center')
+			//spacer + text + spacer
+			);
 	};
 }
 
diff --git a/mods/menu.json b/mods/menu.json
index e96284f7..1def4ca0 100644
--- a/mods/menu.json
+++ b/mods/menu.json
@@ -409,7 +409,7 @@
 					"BT5HM1" : {
 						"mci" : {
 							"HM1" : {
-								"items" : [ "A Clockwork Orange", "Pulp Fiction", "Goonies" ]
+								"items" : [ "One", "Two", "Three" ]
 							},
 							"BT5" : {
 								"text" : "< Back",