mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- helpbox: allow multi-line lines

Browse Source
This commit is contained in:
svenhoefer
2016-12-05 12:46:01 +01:00
parent 05bbf4d9b5
commit 1b42318a2a
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/widget/helpbox.cpp
View File

@@ -75,11 +75,6 @@ void Helpbox::addLine(const std::string& icon, const std::string& text, const in
int h_line = getLineHeight(line_height, font); int h_line = getLineHeight(line_height, font);
CComponentsFrmChain *line = new CComponentsFrmChain(line_indent, hbox_y, 0, h_line); CComponentsFrmChain *line = new CComponentsFrmChain(line_indent, hbox_y, 0, h_line);
if ((hbox_y + h_line)>ccw_body->getHeight()){
addPagebreak();
line->setYPos(hbox_y);
}
line->setPageNumber(page);
int w_body = ccw_body->getWidth(); int w_body = ccw_body->getWidth();
line->setWidth(w_body - 2*line_indent); line->setWidth(w_body - 2*line_indent);
@@ -99,15 +94,31 @@ void Helpbox::addLine(const std::string& icon, const std::string& text, const in
line->addCCItem(picon); line->addCCItem(picon);
} }
int txt_height = 0;
if (!text.empty()){ if (!text.empty()){
int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0); int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0);
CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, line->getHeight(), text, text_mode, font); CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, 0, text, text_mode, font);
#if 0 //"contrast agent", if you want to see where the text items are drawn. #if 0 //"contrast agent", if you want to see where the text items are drawn.
txt->setColorBody(COL_RED); txt->setColorBody(COL_RED);
txt->doPaintBg(true); txt->doPaintBg(true);
#endif #endif
int lines = txt->getCTextBoxObject()->getLines();
txt_height = std::max(lines*font->getHeight(), h_line);
txt->setHeight(txt_height);
line->addCCItem(txt); line->addCCItem(txt);
} }
if (txt_height > line->getHeight())
line->setHeight(txt_height);
if ((hbox_y + line->getHeight()) > ccw_body->getHeight())
{
addPagebreak();
line->setYPos(hbox_y);
}
line->setPageNumber(page);
addWindowItem(line); addWindowItem(line);
} }