mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
MainMenu: Add clear button and icon for search input (#10363)
This commit is contained in:
parent
ccbf8029ea
commit
5066fe7583
@ -23,6 +23,8 @@ paramat:
|
|||||||
textures/base/pack/menu_header.png
|
textures/base/pack/menu_header.png
|
||||||
textures/base/pack/next_icon.png
|
textures/base/pack/next_icon.png
|
||||||
textures/base/pack/prev_icon.png
|
textures/base/pack/prev_icon.png
|
||||||
|
textures/base/pack/clear.png
|
||||||
|
textures/base/pack/search.png
|
||||||
|
|
||||||
rubenwardy, paramat:
|
rubenwardy, paramat:
|
||||||
textures/base/pack/start_icon.png
|
textures/base/pack/start_icon.png
|
||||||
|
@ -340,7 +340,6 @@ function store.get_formspec(dlgdata)
|
|||||||
|
|
||||||
local W = 15.75
|
local W = 15.75
|
||||||
local H = 9.5
|
local H = 9.5
|
||||||
|
|
||||||
local formspec
|
local formspec
|
||||||
if #store.packages_full > 0 then
|
if #store.packages_full > 0 then
|
||||||
formspec = {
|
formspec = {
|
||||||
@ -353,7 +352,8 @@ function store.get_formspec(dlgdata)
|
|||||||
"container[0.375,0.375]",
|
"container[0.375,0.375]",
|
||||||
"field[0,0;7.225,0.8;search_string;;", core.formspec_escape(search_string), "]",
|
"field[0,0;7.225,0.8;search_string;;", core.formspec_escape(search_string), "]",
|
||||||
"field_close_on_enter[search_string;false]",
|
"field_close_on_enter[search_string;false]",
|
||||||
"button[7.225,0;2,0.8;search;", fgettext("Search"), "]",
|
"image_button[7.3,0;0.8,0.8;", core.formspec_escape(defaulttexturedir .. "search.png"), ";search;]",
|
||||||
|
"image_button[8.125,0;0.8,0.8;", core.formspec_escape(defaulttexturedir .. "clear.png"), ";clear;]",
|
||||||
"dropdown[9.6,0;2.4,0.8;type;", table.concat(filter_types_titles, ","), ";", filter_type, "]",
|
"dropdown[9.6,0;2.4,0.8;type;", table.concat(filter_types_titles, ","), ";", filter_type, "]",
|
||||||
"container_end[]",
|
"container_end[]",
|
||||||
|
|
||||||
@ -504,6 +504,13 @@ function store.handle_submit(this, fields)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if fields.clear then
|
||||||
|
search_string = ""
|
||||||
|
cur_page = 1
|
||||||
|
store.filter_packages("")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
if fields.back then
|
if fields.back then
|
||||||
this:delete()
|
this:delete()
|
||||||
return true
|
return true
|
||||||
|
@ -34,7 +34,8 @@ local function get_formspec(tabview, name, tabdata)
|
|||||||
local retval =
|
local retval =
|
||||||
-- Search
|
-- Search
|
||||||
"field[0.15,0.075;5.91,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
|
"field[0.15,0.075;5.91,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
|
||||||
"button[5.62,-0.25;1.5,1;btn_mp_search;" .. fgettext("Search") .. "]" ..
|
"image_button[5.63,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "search.png") .. ";btn_mp_search;]" ..
|
||||||
|
"image_button[6.3,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "clear.png") .. ";btn_mp_clear;]" ..
|
||||||
"image_button[6.97,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png")
|
"image_button[6.97,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png")
|
||||||
.. ";btn_mp_refresh;]" ..
|
.. ";btn_mp_refresh;]" ..
|
||||||
|
|
||||||
@ -243,6 +244,12 @@ local function main_button_handler(tabview, fields, name, tabdata)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if fields.btn_mp_clear then
|
||||||
|
tabdata.search_for = ""
|
||||||
|
menudata.search_result = nil
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
if fields.btn_mp_search or fields.key_enter_field == "te_search" then
|
if fields.btn_mp_search or fields.key_enter_field == "te_search" then
|
||||||
tabdata.fav_selected = 1
|
tabdata.fav_selected = 1
|
||||||
local input = fields.te_search:lower()
|
local input = fields.te_search:lower()
|
||||||
|
BIN
textures/base/pack/clear.png
Normal file
BIN
textures/base/pack/clear.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 708 B |
BIN
textures/base/pack/search.png
Normal file
BIN
textures/base/pack/search.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in New Issue
Block a user