Add tooltips to main menu subgames button bar

minetest · Nov 9, 2014 · 18c583e · 18c583e
1 parent 9b551d5
commit 18c583e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua
@@ -57,10 +57,10 @@ local function buttonbar_formspec(self)
 		end
 
 		formspec = formspec ..
-			string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;%s]",
+			string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;%s]tooltip[%s;%s]",
 					btn_pos.x, btn_pos.y, self.btn_size, self.btn_size,
 					self.buttons[i].image, btn_name, self.buttons[i].caption,
-					borders)
+					borders, btn_name, self.buttons[i].tooltip)
 		else
 			--print("end of displayable buttons: orientation: " .. self.orientation)
 			--print( "button_end: " .. (btn_pos.y + self.btn_size - (self.btn_size * 0.05)))
@@ -140,11 +140,12 @@ local buttonbar_metatable = {
 
 	delete = function(self) ui.delete(self) end,
 
-	add_button = function(self, name, caption, image)
+	add_button = function(self, name, caption, image, tooltip)
 			if caption == nil then caption = "" end
 			if image == nil then image = "" end
+			if tooltip == nil then tooltip = "" end
 
-			table.insert(self.buttons,{ name=name, caption=caption, image=image})
+			table.insert(self.buttons,{ name=name, caption=caption, image=image, tooltip=tooltip})
 			if self.orientation == "horizontal" then
 				if ( (self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2)
 					> self.size.x ) then

diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua
@@ -53,6 +53,7 @@ local function singleplayer_refresh_gamebar()
 
 		local image = nil
 		local text = nil
+		local tooltip = core.formspec_escape(gamemgr.games[i].name)
 
 		if gamemgr.games[i].menuicon_path ~= nil and
 			gamemgr.games[i].menuicon_path ~= "" then
@@ -69,7 +70,7 @@ local function singleplayer_refresh_gamebar()
 				text = text .. "\n" .. part3
 			end
 		end
-		btnbar:add_button(btn_name, text, image)
+		btnbar:add_button(btn_name, text, image, tooltip)
 	end
 end