Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Key settings: Clear with escape (#8282)

Browse Source 
Key ESCAPE -> Cancel change
Key DELETE -> Remove entry
This commit is contained in:
SmallJoker 2020-02-14 20:36:58 +01:00 committed by GitHub
parent 71899e11d2
commit ee7d357602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/gui/guiKeyChangeMenu.cpp
View File

@ -86,8 +86,6 @@ GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
GUIModalMenu(env, parent, id, menumgr) GUIModalMenu(env, parent, id, menumgr)
{ {
init_keys(); init_keys();
for (key_setting *ks : key_settings)
key_used.push_back(ks->key);
} }
GUIKeyChangeMenu::~GUIKeyChangeMenu() GUIKeyChangeMenu::~GUIKeyChangeMenu()
@ -112,6 +110,7 @@ void GUIKeyChangeMenu::removeChildren()
for (gui::IGUIElement *i : children_copy) { for (gui::IGUIElement *i : children_copy) {
i->remove(); i->remove();
} }
key_used_text = nullptr;
} }
void GUIKeyChangeMenu::regenerateGui(v2u32 screensize) void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
@ -246,7 +245,13 @@ void GUIKeyChangeMenu::drawMenu()
bool GUIKeyChangeMenu::acceptInput() bool GUIKeyChangeMenu::acceptInput()
{ {
for (key_setting *k : key_settings) { for (key_setting *k : key_settings) {
g_settings->set(k->setting_name, k->key.sym()); std::string default_key;
g_settings->getDefaultNoEx(k->setting_name, default_key);
if (k->key.sym() != default_key)
g_settings->set(k->setting_name, k->key.sym());
else
g_settings->remove(k->setting_name);
} }
{ {
@ -274,29 +279,28 @@ bool GUIKeyChangeMenu::acceptInput()
bool GUIKeyChangeMenu::resetMenu() bool GUIKeyChangeMenu::resetMenu()
{ {
if (activeKey >= 0) if (active_key) {
{ const wchar_t *text = wgettext(active_key->key.name());
for (key_setting *k : key_settings) { active_key->button->setText(text);
if (k->id == activeKey) { delete[] text;
const wchar_t *text = wgettext(k->key.name()); active_key = nullptr;
k->button->setText(text);
delete[] text;
break;
}
}
activeKey = -1;
return false; return false;
} }
return true; return true;
} }
bool GUIKeyChangeMenu::OnEvent(const SEvent& event) bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
{ {
if (event.EventType == EET_KEY_INPUT_EVENT && activeKey >= 0 if (event.EventType == EET_KEY_INPUT_EVENT && active_key
&& event.KeyInput.PressedDown) { && event.KeyInput.PressedDown) {
bool prefer_character = shift_down; bool prefer_character = shift_down;
KeyPress kp(event.KeyInput, prefer_character); KeyPress kp(event.KeyInput, prefer_character);
if (event.KeyInput.Key == irr::KEY_DELETE)
kp = KeyPress(""); // To erase key settings
else if (event.KeyInput.Key == irr::KEY_ESCAPE)
kp = active_key->key; // Cancel
bool shift_went_down = false; bool shift_went_down = false;
if(!shift_down && if(!shift_down &&
(event.KeyInput.Key == irr::KEY_SHIFT || (event.KeyInput.Key == irr::KEY_SHIFT ||
@ -304,51 +308,46 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
event.KeyInput.Key == irr::KEY_RSHIFT)) event.KeyInput.Key == irr::KEY_RSHIFT))
shift_went_down = true; shift_went_down = true;
// Remove Key already in use message
if(this->key_used_text)
{
this->key_used_text->remove();
this->key_used_text = NULL;
}
// Display Key already in use message // Display Key already in use message
if (std::find(this->key_used.begin(), this->key_used.end(), kp) != this->key_used.end()) bool key_in_use = false;
{ if (strcmp(kp.sym(), "") != 0) {
core::rect < s32 > rect(0, 0, 600, 40); for (key_setting *ks : key_settings) {
if (ks != active_key && ks->key == kp) {
key_in_use = true;
break;
}
}
}
if (key_in_use && !this->key_used_text) {
core::rect<s32> rect(0, 0, 600, 40);
rect += v2s32(0, 0) + v2s32(25, 30); rect += v2s32(0, 0) + v2s32(25, 30);
const wchar_t *text = wgettext("Key already in use"); const wchar_t *text = wgettext("Key already in use");
this->key_used_text = Environment->addStaticText(text, this->key_used_text = Environment->addStaticText(text,
rect, false, true, this, -1); rect, false, true, this, -1);
delete[] text; delete[] text;
//infostream << "Key already in use" << std::endl; } else if (!key_in_use && this->key_used_text) {
this->key_used_text->remove();
this->key_used_text = nullptr;
} }
// But go on // But go on
{ {
key_setting *k = NULL; active_key->key = kp;
for (key_setting *ks : key_settings) { const wchar_t *text = wgettext(kp.name());
if (ks->id == activeKey) { active_key->button->setText(text);
k = ks;
break;
}
}
FATAL_ERROR_IF(k == NULL, "Key setting not found");
k->key = kp;
const wchar_t *text = wgettext(k->key.name());
k->button->setText(text);
delete[] text; delete[] text;
this->key_used.push_back(kp);
// Allow characters made with shift // Allow characters made with shift
if(shift_went_down){ if (shift_went_down){
shift_down = true; shift_down = true;
return false; return false;
} }
activeKey = -1; active_key = nullptr;
return true; return true;
} }
} else if (event.EventType == EET_KEY_INPUT_EVENT && activeKey < 0 } else if (event.EventType == EET_KEY_INPUT_EVENT && !active_key
&& event.KeyInput.PressedDown && event.KeyInput.PressedDown
&& event.KeyInput.Key == irr::KEY_ESCAPE) { && event.KeyInput.Key == irr::KEY_ESCAPE) {
quitMenu(); quitMenu();
@ -377,24 +376,19 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
quitMenu(); quitMenu();
return true; return true;
default: default:
key_setting *k = NULL; resetMenu();
for (key_setting *ks : key_settings) { for (key_setting *ks : key_settings) {
if (ks->id == event.GUIEvent.Caller->getID()) { if (ks->id == event.GUIEvent.Caller->getID()) {
k = ks; active_key = ks;
break; break;
} }
} }
FATAL_ERROR_IF(k == NULL, "Key setting not found"); FATAL_ERROR_IF(!active_key, "Key setting not found");
resetMenu();
shift_down = false; shift_down = false;
activeKey = event.GUIEvent.Caller->getID();
const wchar_t *text = wgettext("press key"); const wchar_t *text = wgettext("press key");
k->button->setText(text); active_key->button->setText(text);
delete[] text; delete[] text;
this->key_used.erase(std::remove(this->key_used.begin(),
this->key_used.end(), k->key), this->key_used.end());
break; break;
} }
Environment->setFocus(this); Environment->setFocus(this);

3
src/gui/guiKeyChangeMenu.h
View File

@ -70,9 +70,8 @@ private:
void add_key(int id, const wchar_t *button_name, const std::string &setting_name); void add_key(int id, const wchar_t *button_name, const std::string &setting_name);
bool shift_down = false; bool shift_down = false;
s32 activeKey = -1;
std::vector<KeyPress> key_used; key_setting *active_key = nullptr;
gui::IGUIStaticText *key_used_text = nullptr; gui::IGUIStaticText *key_used_text = nullptr;
std::vector<key_setting *> key_settings; std::vector<key_setting *> key_settings;
}; };