Tweak display of searching status

When the current search produces no results, give a specific message
rather than "Page 1 of 0".  Don't display the "Filter:" label if no
filtering is currently applied.
This commit is contained in:
Zefram 2014-04-29 20:08:04 +01:00
parent 01297996a6
commit b0e10d44f4

@ -54,6 +54,9 @@ function unified_inventory.get_formspec(player, page)
formspec = formspec .. "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]" formspec = formspec .. "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]"
-- Items list -- Items list
if #unified_inventory.filtered_items_list[player_name] == 0 then
formspec = formspec.."label[8.2,0;No matching items]"
else
local list_index = unified_inventory.current_index[player_name] local list_index = unified_inventory.current_index[player_name]
local page = math.floor(list_index / (80) + 1) local page = math.floor(list_index / (80) + 1)
local pagemax = math.floor( local pagemax = math.floor(
@ -75,8 +78,11 @@ function unified_inventory.get_formspec(player, page)
end end
formspec = formspec.."label[8.2,0;Page:]" formspec = formspec.."label[8.2,0;Page:]"
formspec = formspec.."label[9,0;"..page.." of "..pagemax.."]" formspec = formspec.."label[9,0;"..page.." of "..pagemax.."]"
end
if unified_inventory.activefilter[player_name] ~= "" then
formspec = formspec.."label[8.2,0.4;Filter:]" formspec = formspec.."label[8.2,0.4;Filter:]"
formspec = formspec.."label[9,0.4;"..minetest.formspec_escape(unified_inventory.activefilter[player_name]).."]" formspec = formspec.."label[9,0.4;"..minetest.formspec_escape(unified_inventory.activefilter[player_name]).."]"
end
return formspec return formspec
end end