plop

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

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

@@ -272,15 +272,14 @@ function _M:setSubFocus(id)
 		for i = 1, #self.uis do
 			if self.uis[i].ui == id then id = i break end
 		end
-		if type(id) == "table" then self:no_focus() return end
+		if type(id) == "table" then return end
 	end
 
 	local ui = self.uis[id]
-	if not ui.ui.can_focus then self:no_focus() return end
+	if not ui.ui.can_focus then return end
 	self.focus_ui = ui
 	self.focus_ui_id = id
 	ui.ui:setFocus(true)
-	self:on_focus(id, ui)
 end
 
 function _M:moveUIElement(id, left, right, top, bottom)
@@ -328,9 +327,13 @@ function _M:moveFocus(v)
 	end
 end
 
-function _M:on_focus(id, ui)
-end
-function _M:no_focus()
+function _M:on_focus(v)
+	if not v then
+		self.last_focus = self.focus_ui
+		self:setSubFocus({})
+	else
+		self:setSubFocus(self.focus_ui)
+	end
 end
 
 function _M:mouseEvent(button, x, y, xrel, yrel, bx, by, event)
@@ -345,7 +348,6 @@ function _M:mouseEvent(button, x, y, xrel, yrel, bx, by, event)
 			return
 		end
 	end
-	self:no_focus()
 end
 
 function _M:keyEvent(...)

game/engines/default/modules/boot/dialogs/MainMenu.lua

@@ -35,7 +35,7 @@ function _M:init()
 	self.list = l
 	l[#l+1] = {name="New Game", fct=function() game:registerDialog(require("mod.dialogs.NewGame").new()) end}
 	l[#l+1] = {name="Load Game", fct=function() game:registerDialog(require("mod.dialogs.LoadGame").new()) end}
---	l[#l+1] = {name="Online Profile", fct=function() game:registerDialog(require("mod.dialogs.Profile").new()) end}
+	l[#l+1] = {name="Online Profile", fct=function() game:registerDialog(require("mod.dialogs.Profile").new()) end}
 	l[#l+1] = {name="View High Scores", fct=function() game:registerDialog(require("mod.dialogs.ViewHighScores").new()) end}
 	l[#l+1] = {name="Addons", fct=function() game:registerDialog(require("mod.dialogs.Addons").new()) end}
 --	if config.settings.install_remote then l[#l+1] = {name="Install Module", fct=function() end} end
@@ -63,14 +63,14 @@ function _M:init()
 
 	self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) end, font={"/data/font/DroidSans-Bold.ttf", 16}}
 
-	self.mainlogin = MainLogin.new()
+--	self.mainlogin = MainLogin.new()
 
 	self:loadUI{
 		{left=0, top=0, ui=self.c_list},
 		{left=0, bottom=0, absolute=true, ui=self.c_background},
 		{right=0, top=0, absolute=true, ui=self.c_version},
---		self.c_auth and {right=0, bottom=0, absolute=true, ui=self.c_auth} or nil,
-		{left=450, top=50 + self.c_list.h + 120, absolute=true, ui=self.mainlogin},
+		self.c_auth and {right=0, bottom=0, absolute=true, ui=self.c_auth} or nil,
+--		{left=450, top=50 + self.c_list.h + 120, absolute=true, ui=self.mainlogin},
 	}
 	self:setupUI(false, true)
 	self.key:addBind("LUA_CONSOLE", function()