From 7bab4e5bf533b777ab53bc3b9e96c99d10bce3ff Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Sun, 24 Mar 2019 03:44:38 -0400
Subject: [PATCH] ui built in theme for ext chars

---
 sys/apis/ui.lua                 | 30 +++++++++++++++++++++++++++---
 sys/apis/ui/components/Form.lua |  2 +-
 sys/etc/ext.theme               | 28 ----------------------------
 3 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 sys/etc/ext.theme

diff --git a/sys/apis/ui.lua b/sys/apis/ui.lua
index cafd5aa..11a631a 100644
--- a/sys/apis/ui.lua
+++ b/sys/apis/ui.lua
@@ -213,7 +213,7 @@ function Manager:loadTheme(filename)
 		if not theme then
 			error(err)
 		end
-		self.theme = theme
+		Util.deepMerge(self.theme, theme)
 	end
 end
 
@@ -1197,10 +1197,34 @@ end
 loadComponents()
 
 UI.theme = { }
-UI:loadTheme('usr/config/ui.theme')
 if Util.getVersion() >= 1.76 then
-	UI:loadTheme('sys/etc/ext.theme')
+  UI.theme = {
+		ScrollBar = {
+			lineChar = '|',
+			sliderChar = '\127',
+			upArrowChar = '\30',
+			downArrowChar = '\31',
+		},
+		Checkbox = {
+			checkedIndicator = '\4',
+			leftMarker = '\124',
+			rightMarker = '\124',
+		},
+		Chooser = {
+			leftIndicator = '\17',
+			rightIndicator = '\16',
+		},
+		Grid = {
+			focusIndicator = '\183',
+			inverseSortIndicator = '\24',
+		},
+		TitleBar = {
+			frameChar = '\140',
+			closeInd = '\215',
+		},
+	}
 end
+UI:loadTheme('usr/config/ui.theme')
 
 UI:setDefaultDevice(UI.Device({ device = term.current() }))
 
diff --git a/sys/apis/ui/components/Form.lua b/sys/apis/ui/components/Form.lua
index 6db3085..8ba925e 100644
--- a/sys/apis/ui/components/Form.lua
+++ b/sys/apis/ui/components/Form.lua
@@ -72,7 +72,7 @@ function UI.Form:createForm()
 					value = child.formLabel,
 				})
 			end
-			if child.formKey or child.formLabel then
+			if child.formLabel then
 				y = y + 1
 			end
 		end
diff --git a/sys/etc/ext.theme b/sys/etc/ext.theme
deleted file mode 100644
index 492529e..0000000
--- a/sys/etc/ext.theme
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	ScrollBar = {
-		lineChar = '|',
-		sliderChar = '\127',
-		upArrowChar = '\30',
-		downArrowChar = '\31',
-	},
-	Button = {
-		--focusIndicator = '\183',
-	},
-	Checkbox = {
-		checkedIndicator = '\4',
-		leftMarker = '\124',
-		rightMarker = '\124',
-	},
-	Chooser = {
-		leftIndicator = '\17',
-		rightIndicator = '\16',
-	},
-	Grid = {
-		focusIndicator = '\183',
-		inverseSortIndicator = '\24',
-	},
-	TitleBar = {
-		frameChar = '\140',
-		closeInd = '\215',
-	},
-}