From d130e4784d07ba77044dcb314b7b1b6fa026815a Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 6 Feb 2022 20:12:19 +0100 Subject: [PATCH] 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. --- src/gui/infoviewer.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index d5c39564b..ca3a4e192 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -297,20 +297,9 @@ void CInfoViewer::showRecordIcon (const bool show) rec->setFrameThickness(FRAME_WIDTH_NONE); rec->setShadowWidth(OFFSET_SHADOW/2); 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()) infoViewerBB->getCABar()->kill(); 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); //frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ OFFSET_SHADOW, bottom); if (!(zap_mode & IV_MODE_VIRTUAL_ZAP)){