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

manipulator: better screen width usage

develop
jj 2012-09-28 13:52:54 +02:00
parent c4f26d0aa8
commit ca0097b910
1 changed files with 79 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
plugins/manipulator.cpp
Unescape Escape View File

@ -439,6 +439,7 @@ void viewscreen_unitlaborsst::refreshNames()
cur->transname = Translation::TranslateName(&unit->name, true); cur->transname = Translation::TranslateName(&unit->name, true);
cur->profession = Units::getProfessionName(unit); cur->profession = Units::getProfessionName(unit);
} }
calcSize();
} }
void viewscreen_unitlaborsst::calcSize() void viewscreen_unitlaborsst::calcSize()
@ -448,39 +449,92 @@ void viewscreen_unitlaborsst::calcSize()
num_rows = units.size(); num_rows = units.size();
int num_columns = gps->dimx - DISP_COLUMN_MAX - 1; int num_columns = gps->dimx - DISP_COLUMN_MAX - 1;
for (int i = 0; i < DISP_COLUMN_MAX; i++)
col_widths[i] = 0; // min/max width of columns
while (num_columns > 0) int col_minwidth[DISP_COLUMN_MAX];
int col_maxwidth[DISP_COLUMN_MAX];
col_minwidth[DISP_COLUMN_HAPPINESS] = 4;
col_maxwidth[DISP_COLUMN_HAPPINESS] = 4;
col_minwidth[DISP_COLUMN_NAME] = 0;
col_maxwidth[DISP_COLUMN_NAME] = 0;
col_minwidth[DISP_COLUMN_PROFESSION] = 0;
col_maxwidth[DISP_COLUMN_PROFESSION] = 0;
col_minwidth[DISP_COLUMN_LABORS] = num_columns*3/5; // 60%
col_maxwidth[DISP_COLUMN_LABORS] = NUM_COLUMNS;
// get max_name/max_prof from strings length
for (size_t i = 0; i < units.size(); i++)
{ {
num_columns--; if (col_maxwidth[DISP_COLUMN_NAME] < units[i]->name.size())
// need at least 4 digits for happiness col_maxwidth[DISP_COLUMN_NAME] = units[i]->name.size();
if (col_widths[DISP_COLUMN_HAPPINESS] < 4) if (col_maxwidth[DISP_COLUMN_PROFESSION] < units[i]->profession.size())
col_maxwidth[DISP_COLUMN_PROFESSION] = units[i]->profession.size();
}
// check how much room we have
int width_min = 0, width_max = 0;
for (int i = 0; i < DISP_COLUMN_MAX; i++)
{ {
col_widths[DISP_COLUMN_HAPPINESS]++; width_min += col_minwidth[i];
continue; width_max += col_maxwidth[i];
} }
// of remaining, 20% for Name, 20% for Profession, 60% for Labors
switch (num_columns % 5) if (width_max <= num_columns)
{ {
case 0: case 2: case 4: // lots of space, distribute leftover (except last column)
col_widths[DISP_COLUMN_LABORS]++; int col_margin = (num_columns - width_max) / (DISP_COLUMN_MAX-1);
break; int col_margin_r = (num_columns - width_max) % (DISP_COLUMN_MAX-1);
case 1: for (int i = DISP_COLUMN_MAX-1; i>=0; i--)
col_widths[DISP_COLUMN_NAME]++; {
break; col_widths[i] = col_maxwidth[i];
case 3:
col_widths[DISP_COLUMN_PROFESSION]++; if (i < DISP_COLUMN_MAX-1)
break; {
col_widths[i] += col_margin;
if (col_margin_r)
{
col_margin_r--;
col_widths[i]++;
}
} }
} }
}
else if (width_min <= num_columns)
{
// constrained, give between min and max to every column
int space = num_columns - width_min;
// max size columns not yet seen may consume
int next_consume_max = width_max - width_min;
while (col_widths[DISP_COLUMN_LABORS] > NUM_COLUMNS) for (int i = 0; i < DISP_COLUMN_MAX; i++)
{ {
col_widths[DISP_COLUMN_LABORS]--; // divide evenly remaining space
if (col_widths[DISP_COLUMN_LABORS] & 1) int col_margin = space / (DISP_COLUMN_MAX-i);
col_widths[DISP_COLUMN_NAME]++;
// take more if the columns after us cannot
next_consume_max -= (col_maxwidth[i]-col_minwidth[i]);
if (col_margin < space-next_consume_max)
col_margin = space - next_consume_max;
// no more than maxwidth
if (col_margin > col_maxwidth[i] - col_minwidth[i])
col_margin = col_maxwidth[i] - col_minwidth[i];
col_widths[i] = col_minwidth[i] + col_margin;
space -= col_margin;
}
}
else else
col_widths[DISP_COLUMN_PROFESSION]++; {
// should not happen, min screen is 80x25
int space = num_columns;
for (int i = 0; i < DISP_COLUMN_MAX; i++)
{
col_widths[i] = space / (DISP_COLUMN_MAX-i);
space -= col_widths[i];
}
} }
for (int i = 0; i < DISP_COLUMN_MAX; i++) for (int i = 0; i < DISP_COLUMN_MAX; i++)