vrd/tft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix combinaton

Browse Source
This commit is contained in:
vrd
2023-01-20 23:12:38 +02:00
parent afe6d093a9
commit 9434edbe36
9 changed files with 207 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
person.cpp
+17 -19
View File
@@ -166,31 +166,29 @@ U16 Person::boxWidth() const
/* return pad; */
/* } */
void Person::draw(I16 drawY, I16 drawX, bool selected, bool hasSpouse, bool isSpouse, bool hasKids) const
void Person::draw(const I16 drawY, const I16 drawX, bool selected, bool hasSpouse, bool isSpouse, bool hasKids) const
{
U16 width = boxWidth();
WINDOW* pad = newpad(BOX_HEIGHT, width);
const U16 width = boxWidth(); /* pad width */
auto color_pair = COLOR_PAIR( selected ? COLOR_SELECTED
: (isMale_ ? COLOR_MALE : COLOR_FEMALE) );
if(willBeVisible(drawY, drawX, BOX_HEIGHT, width))
{
WINDOW* pad = newpad(BOX_HEIGHT, width);
auto color_pair = COLOR_PAIR( selected ? COLOR_SELECTED
: (isMale_ ? COLOR_MALE : COLOR_FEMALE) );
wbkgd(pad, color_pair);
/* wattron(pad, color_pair); */
wbkgd(pad, color_pair);
/* wattron(pad, color_pair); */
wborder(pad, ACS_VLINE, ACS_VLINE, ACS_HLINE, ACS_HLINE,
isSpouse ? ACS_TTEE : ACS_LTEE, hasSpouse ? ACS_TTEE : ACS_URCORNER,
hasKids ? ACS_LTEE : ACS_LLCORNER, ACS_LRCORNER );
/* if(hasSpouse) */
/* { */
/* mvaddch( */
wborder(pad, ACS_VLINE, ACS_VLINE, ACS_HLINE, ACS_HLINE,
isSpouse ? ACS_TTEE : ACS_LTEE, hasSpouse ? ACS_TTEE : ACS_URCORNER,
hasKids ? ACS_LTEE : ACS_LLCORNER, ACS_LRCORNER );
mvwaddstr(pad, 2, 2, name_.data());
mvwaddstr(pad, 2, 2, name_.data());
/* wattroff(pad, color_pair); */
/* wattroff(pad, color_pair); */
pnoutrefresh(pad, 0, 0,
drawY, drawX,
drawY + BOX_HEIGHT-1, drawX + width-1);
delwin(pad);
drawpad(pad, drawY, drawX);
delwin(pad);
}
}