From b0d2ce0199741a647349a48c57e3bc0079e43083 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Wed, 22 Apr 2020 23:37:12 -0600
Subject: [PATCH] minor bugfixes - cleanup

---
 sys/apps/Lua.lua                            | 17 ++---------------
 sys/apps/system/diskusage.lua               | 20 +++++++++++++-------
 sys/modules/opus/ui/canvas.lua              |  3 ++-
 sys/modules/opus/ui/components/Checkbox.lua |  3 ++-
 sys/modules/opus/ui/components/TitleBar.lua |  4 +---
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/sys/apps/Lua.lua b/sys/apps/Lua.lua
index 44f2c78..d4d7d50 100644
--- a/sys/apps/Lua.lua
+++ b/sys/apps/Lua.lua
@@ -138,19 +138,6 @@ function page:eventHandler(event)
 		self:executeStatement('_ENV')
 		command = nil
 
-	elseif event.type == 'hide_output' then
-		self.output:disable()
-
-		self.titleBar.oy = -1
-		self.titleBar.event = 'show_output'
-		self.titleBar.closeInd = '^'
-		self.titleBar:resize()
-
-		self.grid.ey = -2
-		self.grid:resize()
-
-		self:draw()
-
 	elseif event.type == 'tab_select' then
 		self:setFocus(self.prompt)
 
@@ -201,7 +188,7 @@ function page:eventHandler(event)
 			command = nil
 			self.grid:setValues(t)
 			self.grid:setIndex(1)
-			self:draw()
+			self.grid:draw()
 		end
 		return true
 
@@ -247,7 +234,7 @@ function page:setResult(result)
 	end
 	self.grid:setValues(t)
 	self.grid:setIndex(1)
-	self:draw()
+	self.grid:draw()
 end
 
 function page.grid:eventHandler(event)
diff --git a/sys/apps/system/diskusage.lua b/sys/apps/system/diskusage.lua
index c0db595..9a07e17 100644
--- a/sys/apps/system/diskusage.lua
+++ b/sys/apps/system/diskusage.lua
@@ -136,6 +136,19 @@ function tab:enable()
 	self:updateDrives()
 	self:updateInfo()
 	UI.Tab.enable(self)
+	self.handler = Event.on({ 'disk', 'disk_eject' }, function()
+		os.sleep(1)
+		if tab.enabled then
+			tab:updateDrives()
+			tab:updateInfo()
+			tab:sync()
+		end
+	end)
+end
+
+function tab:disable()
+	Event.off(self.handler)
+	UI.Tab.disable(self)
 end
 
 function tab:eventHandler(event)
@@ -147,11 +160,4 @@ function tab:eventHandler(event)
 	return true
 end
 
-Event.on({ 'disk', 'disk_eject' }, function()
-	os.sleep(1)
-	tab:updateDrives()
-	tab:updateInfo()
-	tab:sync()
-end)
-
 return tab
diff --git a/sys/modules/opus/ui/canvas.lua b/sys/modules/opus/ui/canvas.lua
index 3003981..8795fa7 100644
--- a/sys/modules/opus/ui/canvas.lua
+++ b/sys/modules/opus/ui/canvas.lua
@@ -361,7 +361,8 @@ function Canvas:__renderLayers(device, offset, doubleBuffer)
 			  y = region[2] - offset.y,
 			  ex = region[3] - offset.x,
 			  ey = region[4] - offset.y },
-			{ x = region[1], y = region[2] }, doubleBuffer)
+			{ x = region[1], y = region[2] },
+			doubleBuffer)
 	end
 	self.regions = nil
 
diff --git a/sys/modules/opus/ui/components/Checkbox.lua b/sys/modules/opus/ui/components/Checkbox.lua
index 0322ad6..50bae5f 100644
--- a/sys/modules/opus/ui/components/Checkbox.lua
+++ b/sys/modules/opus/ui/components/Checkbox.lua
@@ -12,6 +12,7 @@ UI.Checkbox.defaults = {
 	textColor = 'white',
 	backgroundColor = 'black',
 	backgroundFocusColor = 'lightGray',
+	event = 'checkbox_change',
 	height = 1,
 	width = 3,
 	accelerators = {
@@ -52,7 +53,7 @@ end
 function UI.Checkbox:eventHandler(event)
 	if event.type == 'checkbox_toggle' then
 		self.value = not self.value
-		self:emit({ type = 'checkbox_change', checked = self.value, element = self })
+		self:emit({ type = self.event, checked = self.value, element = self })
 		self:draw()
 		return true
 	end
diff --git a/sys/modules/opus/ui/components/TitleBar.lua b/sys/modules/opus/ui/components/TitleBar.lua
index 743103a..035642b 100644
--- a/sys/modules/opus/ui/components/TitleBar.lua
+++ b/sys/modules/opus/ui/components/TitleBar.lua
@@ -77,9 +77,7 @@ function UI.TitleBar.example()
 				x = 2, y = 3,
 				text = 'Press',
 			},
-			focus = function (self)
-				self:raise()
-			end,
+			focus = UI.Window.raise,
 		},
 		draw = function(self, isBG)
 			for i = 1, self.height do