summaryrefslogtreecommitdiff
path: root/detailview.c
diff options
context:
space:
mode:
authorkamel5 <kamel5 (at) gmx (dot) net>2018-05-03 13:33:40 +0200
committerkamel5 <kamel5 (at) gmx (dot) net>2018-05-03 13:33:40 +0200
commit0ae15aebbf31c52fd676e1d68ee45402b857750d (patch)
tree8b08cb4b3a2324f7e0e59b1ebea7ad5ecc21afda /detailview.c
parentf593ad572046998285e01ee0f5f767f88e25a94a (diff)
downloadskin-nopacity-0ae15aebbf31c52fd676e1d68ee45402b857750d.tar.gz
skin-nopacity-0ae15aebbf31c52fd676e1d68ee45402b857750d.tar.bz2
Use std::max and std::min
Diffstat (limited to 'detailview.c')
-rw-r--r--detailview.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/detailview.c b/detailview.c
index ad230b5..6b7f266 100644
--- a/detailview.c
+++ b/detailview.c
@@ -92,7 +92,7 @@ void cNopacityView::DrawHeader(void) {
if (channel) {
cImage *logo = imgCache->GetLogo(ctLogo, channel);
if (logo) {
- pixmapHeaderLogo->DrawImage(cPoint(border, max((headerHeight - geoManager->channelLogoHeight - border)/2, 0)), *logo);
+ pixmapHeaderLogo->DrawImage(cPoint(border, std::max((headerHeight - geoManager->channelLogoHeight - border)/2, 0)), *logo);
xText += logoWidth + border;
}
}
@@ -191,7 +191,7 @@ void cNopacityView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cT
int textLinesFull = wTextFull.Lines();
int textHeight = lineHeight * (textLinesTall + textLinesFull) + 2*border;
int yText = border;
- CreateContent(max(textHeight, imgHeight + 2*border));
+ CreateContent(std::max(textHeight, imgHeight + 2*border));
for (int i=0; i < textLinesTall; i++) {
pixmapContent->DrawText(cPoint(border, yText), wTextTall.GetLine(i), Theme.Color(clrMenuFontDetailViewText), clrTransparent, font);
yText += lineHeight;