infoviewer: More simplified rec-info implementation.

More simplified rec-info implementation, enable own blinking effect
of rec object and align background to info bar gradient settings.
This commit is contained in:
2022-02-06 20:12:19 +01:00
parent aa560d175c
commit d130e4784d

View File

@@ -297,20 +297,9 @@ void CInfoViewer::showRecordIcon (const bool show)
rec->setFrameThickness(FRAME_WIDTH_NONE); rec->setFrameThickness(FRAME_WIDTH_NONE);
rec->setShadowWidth(OFFSET_SHADOW/2); rec->setShadowWidth(OFFSET_SHADOW/2);
rec->setCorner(RADIUS_MIN, CORNER_ALL); rec->setCorner(RADIUS_MIN, CORNER_ALL);
rec->enableColBodyGradient(g_settings.theme.infobar_gradient_top, g_settings.theme.infobar_gradient_top ? COL_INFOBAR_PLUS_0 : header->getColorBody(), g_settings.theme.infobar_gradient_top_direction);
rec->paintBlink(500);
} }
if (rec->isPainted())
{
if (rec->getCCItem(0))
{
if (rec->getCCItem(0)->isPainted())
rec->getCCItem(0)->kill();
else
rec->getCCItem(0)->paint();
}
}
else
rec->paint();
} }
} }
@@ -2013,7 +2002,11 @@ void CInfoViewer::killTitle()
if (infoViewerBB->getCABar()) if (infoViewerBB->getCABar())
infoViewerBB->getCABar()->kill(); infoViewerBB->getCABar()->kill();
if (rec) if (rec)
rec->kill(); {
rec->cancelBlink();
delete rec;
rec = NULL;
}
//printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW-BoxStartX, bottom-BoxStartY); //printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW-BoxStartX, bottom-BoxStartY);
//frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW, bottom); //frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW, bottom);
if (!(zap_mode & IV_MODE_VIRTUAL_ZAP)){ if (!(zap_mode & IV_MODE_VIRTUAL_ZAP)){