From 80acee49e1540ca3ec5ff468559f50ade9e14984 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Wed, 10 Apr 2019 16:48:02 +0200 Subject: [PATCH] Changes for Rec Icon in DrawHeader --- view.c | 9 ++------- view.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/view.c b/view.c index a2074b2..d0dd604 100644 --- a/view.c +++ b/view.c @@ -16,7 +16,6 @@ cView::cView(void) { pixmapBackground = NULL; pixmapHeader = NULL; pixmapHeaderLogo = NULL; - pixmapHeaderIcon = NULL; pixmapContent = NULL; pixmapTabs = NULL; pixmapScrollbar = NULL; @@ -47,8 +46,6 @@ cView::~cView(void) { delete pixmapHeader; if (pixmapHeaderLogo) osdManager.releasePixmap(pixmapHeaderLogo); - if (pixmapHeaderIcon) - osdManager.releasePixmap(pixmapHeaderIcon); if (pixmapContent) osdManager.releasePixmap(pixmapContent); if (pixmapTabs) @@ -157,10 +154,8 @@ void cView::DrawHeader(void) { int height = fontManager.FontDetailHeader->Height() + 10; int posX = headerWidth - widthIcon - 25; int posY = ySubtitle - 5; - if (!pixmapHeaderIcon) - pixmapHeaderIcon = osdManager.requestPixmap(7, cRect(posX, posY, widthIcon, height)); - pixmapHeaderIcon->DrawRectangle(cRect(0, 0, widthIcon, height), iconColor); - pixmapHeaderIcon->DrawText(cPoint(5, 5), *recIconText, theme.Color(clrFont), iconColor, fontManager.FontDetailHeader); + pixmapHeader->DrawRectangle( cRect(posX, posY, widthIcon, height), iconColor); + pixmapHeader->DrawText(cPoint(posX + 5, posY + 5), *recIconText, theme.Color(clrFont), iconColor, fontManager.FontDetailHeader); } } diff --git a/view.h b/view.h index 8e30c3f..17292bd 100644 --- a/view.h +++ b/view.h @@ -35,7 +35,6 @@ protected: cPixmap *pixmapBackground; cStyledPixmap *pixmapHeader; cPixmap *pixmapHeaderLogo; - cPixmap *pixmapHeaderIcon; cPixmap *pixmapContent; cPixmap *pixmapScrollbar; cPixmap *pixmapScrollbarBack;