From 0929a8d511d3adc376aaa58963be95bf51497fe4 Mon Sep 17 00:00:00 2001 From: louis Date: Sun, 2 Jun 2013 10:36:57 +0200 Subject: [PATCH] added frame around scaled video picture --- statusheader.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/statusheader.c b/statusheader.c index 1ba3b49..c798109 100644 --- a/statusheader.c +++ b/statusheader.c @@ -11,7 +11,6 @@ cStatusHeader::cStatusHeader(void) { width = tvguideConfig.osdWidth; } int tvFrameWidth = tvguideConfig.osdWidth - width; - int radius = tvguideConfig.statusHeaderHeight / 8; pixmap = osdManager.requestPixmap(1, cRect(0, 0, width, height)); pixmapText = osdManager.requestPixmap(2, cRect(0, 0, width, height)); pixmapText->Fill(clrTransparent); @@ -19,10 +18,17 @@ cStatusHeader::cStatusHeader(void) { pixmapTVFrame = osdManager.requestPixmap(1, cRect(width, 0, tvFrameWidth, height)); pixmapTVFrame->Fill(clrTransparent); if (tvguideConfig.decorateVideo) { - pixmapTVFrame->DrawEllipse(cRect(0,0,radius,radius), theme.Color(clrBackground), -2); - pixmapTVFrame->DrawEllipse(cRect(tvFrameWidth - radius, 0, radius, radius), theme.Color(clrBackground), -1); - pixmapTVFrame->DrawEllipse(cRect(0, height - radius, radius, radius), theme.Color(clrBackground), -3); - pixmapTVFrame->DrawEllipse(cRect(tvFrameWidth - radius, height - radius, radius, radius), theme.Color(clrBackground), -4); + int radius = 16; + int frame = 10; + pixmapTVFrame->DrawRectangle(cRect(0, 0, tvFrameWidth, frame), theme.Color(clrBackground)); + pixmapTVFrame->DrawEllipse(cRect(frame,frame,radius,radius), theme.Color(clrBackground), -2); + pixmapTVFrame->DrawRectangle(cRect(tvFrameWidth - frame, frame, frame, height - 2*frame), theme.Color(clrBackground)); + pixmapTVFrame->DrawEllipse(cRect(tvFrameWidth - radius - frame, frame, radius, radius), theme.Color(clrBackground), -1); + pixmapTVFrame->DrawRectangle(cRect(0, frame, frame, height - 2*frame), theme.Color(clrBackground)); + pixmapTVFrame->DrawEllipse(cRect(frame, height - radius - frame, radius, radius), theme.Color(clrBackground), -3); + pixmapTVFrame->DrawRectangle(cRect(0, height - frame, tvFrameWidth, frame), theme.Color(clrBackground)); + pixmapTVFrame->DrawEllipse(cRect(tvFrameWidth - radius - frame, height - radius - frame, radius, radius), theme.Color(clrBackground), -4); + } drawBackground(); drawBorder(); @@ -50,7 +56,7 @@ void cStatusHeader::ScaleVideo(void) { } void cStatusHeader::DrawInfoText(cGrid *grid) { - int border = 5; + int border = 10; tColor colorTextBack = (tvguideConfig.useBlending==0)?color:clrTransparent; pixmapText->Fill(clrTransparent); int x = border;