|
|
@ -1592,7 +1592,7 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
|
|
|
|
if (enabler->mouse_lbut)
|
|
|
|
if (enabler->mouse_lbut)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
input_row = click_unit;
|
|
|
|
input_row = click_unit;
|
|
|
|
events->insert(interface_key::UNITJOB_VIEW);
|
|
|
|
events->insert(interface_key::UNITJOB_VIEW_UNIT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (enabler->mouse_rbut)
|
|
|
|
if (enabler->mouse_rbut)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1804,7 +1804,7 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
|
|
|
|
|
|
|
|
|
|
|
|
if (VIRTUAL_CAST_VAR(unitlist, df::viewscreen_unitlistst, parent))
|
|
|
|
if (VIRTUAL_CAST_VAR(unitlist, df::viewscreen_unitlistst, parent))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (events->count(interface_key::UNITJOB_VIEW) || events->count(interface_key::UNITJOB_ZOOM_CRE))
|
|
|
|
if (events->count(interface_key::UNITJOB_VIEW_UNIT) || events->count(interface_key::UNITJOB_ZOOM_CRE))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
for (int i = 0; i < unitlist->units[unitlist->page].size(); i++)
|
|
|
|
for (int i = 0; i < unitlist->units[unitlist->page].size(); i++)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -2057,7 +2057,7 @@ void viewscreen_unitlaborsst::render()
|
|
|
|
OutputString(10, x, y, Screen::getKeyDisplay(interface_key::SELECT_ALL));
|
|
|
|
OutputString(10, x, y, Screen::getKeyDisplay(interface_key::SELECT_ALL));
|
|
|
|
OutputString(canToggle ? 15 : 8, x, y, ": Toggle Group, ");
|
|
|
|
OutputString(canToggle ? 15 : 8, x, y, ": Toggle Group, ");
|
|
|
|
|
|
|
|
|
|
|
|
OutputString(10, x, y, Screen::getKeyDisplay(interface_key::UNITJOB_VIEW));
|
|
|
|
OutputString(10, x, y, Screen::getKeyDisplay(interface_key::UNITJOB_VIEW_UNIT));
|
|
|
|
OutputString(15, x, y, ": ViewCre, ");
|
|
|
|
OutputString(15, x, y, ": ViewCre, ");
|
|
|
|
|
|
|
|
|
|
|
|
OutputString(10, x, y, Screen::getKeyDisplay(interface_key::UNITJOB_ZOOM_CRE));
|
|
|
|
OutputString(10, x, y, Screen::getKeyDisplay(interface_key::UNITJOB_ZOOM_CRE));
|
|
|
|