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

Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop

develop
lethosor 2015-03-05 16:55:30 -05:00
parent e19123b71b 6f276ac419
commit efa9224eef
3 changed files with 892 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
Unescape Escape View File

@ -100,6 +100,8 @@ DFHack 0.40.24-r0
New Tweaks
Misc Improvements
added support for searching more lists
manipulator: current job as a view mode (in addition to profession and squad)
manipulator: custom profession templates, with masking
DFHack 0.40.23-r1
Internals

890
plugins/manipulator.cpp
View File

File diff suppressed because it is too large Load Diff

9
plugins/uicommon.h
Unescape Escape View File

@ -451,6 +451,7 @@ public:
bool allow_null;
bool auto_select;
bool allow_search;
bool feed_mouse_set_highlight;
bool feed_changed_highlight;
ListColumn()
@ -465,6 +466,7 @@ public:
allow_null = true;
auto_select = false;
allow_search = true;
feed_mouse_set_highlight = false;
feed_changed_highlight = false;
}
@ -719,7 +721,7 @@ public:
{
vector<T> results = getSelectedElems(true);
if (results.size() == 0)
return nullptr;
return (T)nullptr;
else
return results[0];
}
@ -765,7 +767,7 @@ public:
bool feed(set<df::interface_key> *input)
{
feed_changed_highlight = false;
feed_mouse_set_highlight = feed_changed_highlight = false;
if (input->count(interface_key::CURSOR_UP))
{
changeHighlight(-1);
@ -838,7 +840,10 @@ public:
{
int new_index = display_start_offset + gps->mouse_y - 3;
if (new_index < display_list.size())
{
setHighlight(new_index);
feed_mouse_set_highlight = true;
}
enabler->mouse_lbut = enabler->mouse_rbut = 0;