diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | detailview.c | 10 |
2 files changed, 7 insertions, 4 deletions
@@ -424,3 +424,4 @@ Version 1.1.2 - Restructured detailed EPG and recordings view - fixed naming of reruns tab when displaying recordings - scroll speed with up / down configurable (lines per click) +- fixed bug that floating text is not shown completely diff --git a/detailview.c b/detailview.c index aea4006..5a7edc6 100644 --- a/detailview.c +++ b/detailview.c @@ -152,7 +152,7 @@ void cNopacityView::DrawContent(std::string *text) { wText.Set(text->c_str(), font, width - 2 * border);
int lineHeight = font->Height();
int textLines = wText.Lines();
- int textHeight = lineHeight * textLines + border;
+ int textHeight = lineHeight * textLines + 2*border;
int yText = border;
CreateContent(textHeight);
for (int i=0; i < textLines; i++) {
@@ -182,7 +182,7 @@ void cNopacityView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cT int lineHeight = font->Height();
int textLinesTall = wTextTall.Lines();
int textLinesFull = wTextFull.Lines();
- int textHeight = lineHeight * (textLinesTall + textLinesFull) + border;
+ int textHeight = lineHeight * (textLinesTall + textLinesFull) + 2*border;
int yText = border;
CreateContent(max(textHeight, imgHeight + 2*border));
for (int i=0; i < textLinesTall; i++) {
@@ -255,9 +255,11 @@ void cNopacityView::CreateFloatingTextWrapper(cTextWrapper *twNarrow, cTextWrapp sstrTextFull << wrapper.GetLine(line) << " ";
}
}
+ sstrTextFull << "\n";
drawNarrow = false;
}
} else {
+ wrapper.Set((flds[i].c_str()), font, width - 2*border);
for (int line = 0; line < wrapper.Lines(); line++) {
sstrTextFull << wrapper.GetLine(line) << " ";
}
@@ -806,9 +808,9 @@ void cNopacitySeriesView::Action(void) { int randomPoster = GetRandomPoster();
switch (activeView) {
case mvtInfo:
- if (randomPoster >= 0)
+ if (randomPoster >= 0) {
DrawFloatingContent(&infoText, &series.posters[randomPoster]);
- else
+ } else
DrawContent(&infoText);
break;
case mvtAddInfo:
|