plop

git-svn-id: http://svn.net-core.org/repos/t-engine4@1363 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/dialogs/ShowStore.lua

@@ -66,7 +66,7 @@ function _M:init(title, store_inven, actor_inven, store_filter, actor_filter, ac
 		__TEXTINPUT = function(c)
 			local list
 			if self.focus_ui and self.focus_ui.ui == self.c_inven then list = self.c_inven.list
-			elseif self.focus_ui and self.focus_ui.ui == self.c_equip then list = self.c_equip.list
+			elseif self.focus_ui and self.focus_ui.ui == self.c_store then list = self.c_store.list
 			end
 			if list and list.chars[c] then
 				self:use(list[list.chars[c]])

game/engines/default/engine/ui/Dialog.lua

@@ -33,10 +33,10 @@ function _M:simplePopup(title, text, fct, no_leave)
 	if not no_leave then
 		d.key:addBind("EXIT", function() game:unregisterDialog(d) if fct then fct() end end)
 		local close = require("engine.ui.Button").new{text="Close", fct=function() d.key:triggerVirtual("EXIT") end}
-		d:loadUI{no_reset=true, {hcenter = -close.w / 2, bottom = 3, ui=close}}
+		d:loadUI{no_reset=true, {hcenter = 0, bottom = 3, ui=close}}
 		d:setFocus(close)
 	end
-	d:setupUI()
+	d:setupUI(true, true)
 	game:registerDialog(d)
 	return d
 end
@@ -49,10 +49,10 @@ function _M:simpleLongPopup(title, text, w, fct, no_leave)
 	if not no_leave then
 		d.key:addBind("EXIT", function() game:unregisterDialog(d) if fct then fct() end end)
 		local close = require("engine.ui.Button").new{text="Close", fct=function() d.key:triggerVirtual("EXIT") end}
-		d:loadUI{no_reset=true, {hcenter = -close.w / 2, bottom = 3, ui=close}}
+		d:loadUI{no_reset=true, {hcenter = 0, bottom = 3, ui=close}}
 		d:setFocus(close)
 	end
-	d:setupUI()
+	d:setupUI(true, true)
 	game:registerDialog(d)
 	return d
 end
@@ -72,7 +72,7 @@ function _M:yesnoPopup(title, text, fct, yes_text, no_text)
 		{right = 3, bottom = 3, ui=cancel},
 	}
 	d:setFocus(ok)
-	d:setupUI()
+	d:setupUI(true, true)
 
 	game:registerDialog(d)
 	return d
@@ -92,7 +92,7 @@ function _M:yesnoLongPopup(title, text, w, fct, yes_text, no_text)
 		{right = 3, bottom = 3, ui=cancel},
 	}
 	d:setFocus(ok)
-	d:setupUI()
+	d:setupUI(true, true)
 
 	game:registerDialog(d)
 	return d

game/engines/default/engine/ui/Numberbox.lua

@@ -145,6 +145,7 @@ function _M:updateText(v)
 			text = text .. self.tmp[i]
 		end
 	else
+		self.number = self.number or 0
 		self.number = util.bound(self.number + v, self.min, self.max)
 		text = tostring(self.number)
 		self.tmp = {}

game/engines/default/engine/ui/Textzone.lua

@@ -39,7 +39,7 @@ function _M:generate()
 	self.mouse:reset()
 	self.key:reset()
 
-	local list = self.text:splitLines(self.w - 10, self.font)
+	local list = self.text:splitLines(self.w, self.font)
 	self.scroll = 1
 	self.max = #list