summaryrefslogtreecommitdiff
path: root/src/guiFormSpecMenu.cpp
diff options
context:
space:
mode:
authorngosang <diegodelasheras@gmail.com>2015-01-27 01:17:04 +0100
committerCraig Robbins <kde.psych@gmail.com>2015-02-10 21:23:16 +1000
commitdd2bb950be36c3ae34caacfe62df391612364f8a (patch)
treee4a299e746c2fadae7a84bbd1a462b83be66519c /src/guiFormSpecMenu.cpp
parenta704c04f00bfea4b77550169fa08105c2ee0dfd0 (diff)
downloadminetest-dd2bb950be36c3ae34caacfe62df391612364f8a.tar.gz
minetest-dd2bb950be36c3ae34caacfe62df391612364f8a.tar.bz2
minetest-dd2bb950be36c3ae34caacfe62df391612364f8a.zip
Fix Exit to OS button focus in Pause Menu
Diffstat (limited to 'src/guiFormSpecMenu.cpp')
-rw-r--r--src/guiFormSpecMenu.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 20c9ecde7..3f285fa5e 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -97,6 +97,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
m_form_src(fsrc),
m_text_dst(tdst),
m_formspec_version(0),
+ m_focused_element(L""),
m_font(NULL)
#ifdef __ANDROID__
,m_JavaDialogFieldName(L"")
@@ -1757,8 +1758,6 @@ void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
<<std::endl;
}
-
-
void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
{
/* useless to regenerate without a screensize */
@@ -1775,6 +1774,10 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
mydata.table_dyndata[tablename] = table->getDynamicData();
}
+ //set focus
+ if (!m_focused_element.empty())
+ mydata.focused_fieldname = m_focused_element;
+
//preserve focus
gui::IGUIElement *focused_element = Environment->getFocus();
if (focused_element && focused_element->getParent() == this) {