Changes for Rec Icon in DrawHeader

This commit is contained in:
kamel5 2019-04-10 16:48:02 +02:00
parent 6095fb4dbc
commit 80acee49e1
2 changed files with 2 additions and 8 deletions

9
view.c
View File

@ -16,7 +16,6 @@ cView::cView(void) {
pixmapBackground = NULL; pixmapBackground = NULL;
pixmapHeader = NULL; pixmapHeader = NULL;
pixmapHeaderLogo = NULL; pixmapHeaderLogo = NULL;
pixmapHeaderIcon = NULL;
pixmapContent = NULL; pixmapContent = NULL;
pixmapTabs = NULL; pixmapTabs = NULL;
pixmapScrollbar = NULL; pixmapScrollbar = NULL;
@ -47,8 +46,6 @@ cView::~cView(void) {
delete pixmapHeader; delete pixmapHeader;
if (pixmapHeaderLogo) if (pixmapHeaderLogo)
osdManager.releasePixmap(pixmapHeaderLogo); osdManager.releasePixmap(pixmapHeaderLogo);
if (pixmapHeaderIcon)
osdManager.releasePixmap(pixmapHeaderIcon);
if (pixmapContent) if (pixmapContent)
osdManager.releasePixmap(pixmapContent); osdManager.releasePixmap(pixmapContent);
if (pixmapTabs) if (pixmapTabs)
@ -157,10 +154,8 @@ void cView::DrawHeader(void) {
int height = fontManager.FontDetailHeader->Height() + 10; int height = fontManager.FontDetailHeader->Height() + 10;
int posX = headerWidth - widthIcon - 25; int posX = headerWidth - widthIcon - 25;
int posY = ySubtitle - 5; int posY = ySubtitle - 5;
if (!pixmapHeaderIcon) pixmapHeader->DrawRectangle( cRect(posX, posY, widthIcon, height), iconColor);
pixmapHeaderIcon = osdManager.requestPixmap(7, cRect(posX, posY, widthIcon, height)); pixmapHeader->DrawText(cPoint(posX + 5, posY + 5), *recIconText, theme.Color(clrFont), iconColor, fontManager.FontDetailHeader);
pixmapHeaderIcon->DrawRectangle(cRect(0, 0, widthIcon, height), iconColor);
pixmapHeaderIcon->DrawText(cPoint(5, 5), *recIconText, theme.Color(clrFont), iconColor, fontManager.FontDetailHeader);
} }
} }

1
view.h
View File

@ -35,7 +35,6 @@ protected:
cPixmap *pixmapBackground; cPixmap *pixmapBackground;
cStyledPixmap *pixmapHeader; cStyledPixmap *pixmapHeader;
cPixmap *pixmapHeaderLogo; cPixmap *pixmapHeaderLogo;
cPixmap *pixmapHeaderIcon;
cPixmap *pixmapContent; cPixmap *pixmapContent;
cPixmap *pixmapScrollbar; cPixmap *pixmapScrollbar;
cPixmap *pixmapScrollbarBack; cPixmap *pixmapScrollbarBack;