From 198a3fc4de41499039dc7ef748fa49dd8a3ebcb6 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Tue, 24 Apr 2012 23:41:37 +0800
Subject: [PATCH] add dummy span widgets & make clock count on seconds

---
 dialog.lua |  4 +---
 widget.lua | 22 ++++++++++++++++++++++
 wtest.lua  |  4 ++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/dialog.lua b/dialog.lua
index fa35501d2..c168f0852 100644
--- a/dialog.lua
+++ b/dialog.lua
@@ -150,9 +150,7 @@ function ConfirmBox:init()
 				ImageWidget:new{
 					file = "resources/info-i.png"
 				},
-				Widget:new{
-					dimen = { w = 10, h = 0 }
-				},
+				HorizontalSpan:new{ width = 10 },
 				VerticalGroup:new{
 					align = "left",
 					TextWidget:new{
diff --git a/widget.lua b/widget.lua
index 602688311..8d74abe8e 100644
--- a/widget.lua
+++ b/widget.lua
@@ -276,6 +276,17 @@ function HorizontalGroup:free()
 	WidgetContainer.free(self)
 end
 
+--[[
+Dummy Widget that reserves horizontal space
+]]
+HorizontalSpan = Widget:new{
+	width = 0,
+}
+
+function HorizontalSpan:getSize()
+	return {w = self.width, h = 0}
+end
+
 --[[
 A Layout widget that puts objects under each other
 ]]
@@ -324,6 +335,17 @@ function VerticalGroup:free()
 	WidgetContainer.free(self)
 end
 
+--[[
+Dummy Widget that reserves vertical space
+]]
+VerticalSpan = Widget:new{
+	width = 0,
+}
+
+function VerticalSpan:getSize()
+	return {w = 0, h = self.width}
+end
+
 --[[
 an UnderlineContainer is a WidgetContainer that is able to paint
 a line under its child node
diff --git a/wtest.lua b/wtest.lua
index 13428d2e4..824cb5df4 100644
--- a/wtest.lua
+++ b/wtest.lua
@@ -53,7 +53,7 @@ function Clock:schedFunc()
 	UIManager:setDirty(self)
 	-- reschedule
 	-- TODO: wait until next real minute shift
-	UIManager:scheduleIn(60, function() self:schedFunc() end)
+	UIManager:scheduleIn(1, function() self:schedFunc() end)
 end
 
 function Clock:onShow()
@@ -65,7 +65,7 @@ function Clock:getTextWidget()
 	return CenterContainer:new{
 		dimen = { w = 300, h = 25 },
 		TextWidget:new{
-			text = os.date("%H:%M"),
+			text = os.date("%H:%M:%S"),
 			face = Font:getFace("cfont", 12)
 		}
 	}