summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--displayreplay.c21
-rw-r--r--displayreplay.h1
3 files changed, 21 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 8fef899..5c8aade 100644
--- a/HISTORY
+++ b/HISTORY
@@ -360,3 +360,4 @@ Version 0.1.4
uses correct height
- size of channel logos in main menu timers display configurable as
percent of timer width
+- Added theme dependend background for status icon in displayreplay
diff --git a/displayreplay.c b/displayreplay.c
index 12fcd66..c11c543 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -28,6 +28,7 @@ cNopacityDisplayReplay::~cNopacityDisplayReplay() {
osd->DestroyPixmap(pixmapProgressBar);
osd->DestroyPixmap(pixmapCurrent);
osd->DestroyPixmap(pixmapTotal);
+ osd->DestroyPixmap(pixmapScreenResBackground);
osd->DestroyPixmap(pixmapScreenRes);
osd->DestroyPixmap(pixmapJump);
}
@@ -89,7 +90,11 @@ void cNopacityDisplayReplay::CreatePixmaps(void) {
+ geoManager->replayProgressBarHeight,
geoManager->replayWidth/5,
geoManager->replayCurrentHeight));
- pixmapScreenRes = osd->CreatePixmap(5, cRect(geoManager->replayResolutionX,
+ pixmapScreenResBackground = osd->CreatePixmap(5, cRect(geoManager->replayResolutionX - 10,
+ geoManager->replayResolutionY - 5,
+ geoManager->replayResolutionSize * 3 + 20,
+ geoManager->replayResolutionSize + 10));
+ pixmapScreenRes = osd->CreatePixmap(6, cRect(geoManager->replayResolutionX,
geoManager->replayResolutionY,
geoManager->replayResolutionSize * 3,
geoManager->replayResolutionSize));
@@ -146,6 +151,7 @@ void cNopacityDisplayReplay::CreatePixmaps(void) {
pixmapProgressBar->SetAlpha(0);
pixmapCurrent->SetAlpha(0);
pixmapTotal->SetAlpha(0);
+ pixmapScreenResBackground->SetAlpha(0);
pixmapScreenRes->SetAlpha(0);
pixmapJump->SetAlpha(0);
}
@@ -201,6 +207,7 @@ void cNopacityDisplayReplay::DrawBackground(void) {
}
pixmapControls->Fill(clrTransparent);
pixmapProgressBar->Fill(clrTransparent);
+ pixmapScreenResBackground->Fill(clrTransparent);
pixmapScreenRes->Fill(clrTransparent);
pixmapJump->Fill(clrTransparent);
} else {
@@ -273,8 +280,17 @@ void cNopacityDisplayReplay::DrawScreenResolution(void) {
}
int replaySize = geoManager->replayResolutionSize;
cImage *imgRes = imgCache->GetSkinIcon(*iconName, 3 * replaySize, replaySize);
- if (imgRes)
+ if (imgRes) {
+ pixmapScreenResBackground->Fill(Theme.Color(clrStatusIconsBack));
+ DrawRoundedCorners(pixmapScreenResBackground,
+ 5,
+ 0,
+ 0,
+ pixmapScreenResBackground->ViewPort().Width(),
+ pixmapScreenResBackground->ViewPort().Height()
+ );
pixmapScreenRes->DrawImage(cPoint(0,0), *imgRes);
+ }
}
void cNopacityDisplayReplay::SetRecording(const cRecording *Recording) {
@@ -464,6 +480,7 @@ void cNopacityDisplayReplay::Action(void) {
pixmapProgressBar->SetAlpha(Alpha);
pixmapCurrent->SetAlpha(Alpha);
pixmapTotal->SetAlpha(Alpha);
+ pixmapScreenResBackground->SetAlpha(Alpha);
pixmapScreenRes->SetAlpha(Alpha);
pixmapJump->SetAlpha(Alpha);
}
diff --git a/displayreplay.h b/displayreplay.h
index 99ee022..33ed2ca 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -24,6 +24,7 @@ private:
cPixmap *pixmapCurrent;
cPixmap *pixmapTotal;
cPixmap *pixmapScreenRes;
+ cPixmap *pixmapScreenResBackground;
cPixmap *pixmapControls;
cPixmap *pixmapRew;
cPixmap *pixmapPause;