MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stocks: Make LEAVESCREEN have priority over text entry 

This should fix conflicts if LEAVESCREEN is bound to "Space" only
develop
Lethosor 2014-12-03 17:52:42 -05:00
parent 760acf017b
commit 16c2d4df99
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/stocks.cpp
Unescape Escape View File

@ -655,6 +655,13 @@ public:
void feed(set<df::interface_key> *input) void feed(set<df::interface_key> *input)
{ {
if (input->count(interface_key::LEAVESCREEN))
{
input->clear();
Screen::dismiss(this);
return;
}
bool key_processed = false; bool key_processed = false;
switch (selected_column) switch (selected_column)
{ {
@ -666,13 +673,6 @@ public:
if (key_processed) if (key_processed)
return; return;
if (input->count(interface_key::LEAVESCREEN))
{
input->clear();
Screen::dismiss(this);
return;
}
if (input->count(interface_key::CUSTOM_CTRL_J)) if (input->count(interface_key::CUSTOM_CTRL_J))
{ {
hide_flags.bits.in_job = !hide_flags.bits.in_job; hide_flags.bits.in_job = !hide_flags.bits.in_job;