summaryrefslogtreecommitdiff
path: root/displaymenuview.c
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2013-11-17 15:34:11 +0100
committerlouis <louis.braun@gmx.de>2013-11-17 15:34:11 +0100
commit1003296f4c47504a0d4723ae04e314529f2d05a5 (patch)
tree68153e8b4f8d8c67dd7dc389e8d317082277e117 /displaymenuview.c
parentf942b7ba3efd3ad94f685e23ca7f8cfaa29da8c1 (diff)
downloadskin-nopacity-1003296f4c47504a0d4723ae04e314529f2d05a5.tar.gz
skin-nopacity-1003296f4c47504a0d4723ae04e314529f2d05a5.tar.bz2
Added EPG Info in narrow Timers Menu
Diffstat (limited to 'displaymenuview.c')
-rw-r--r--displaymenuview.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/displaymenuview.c b/displaymenuview.c
index 530f08f..7298311 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -32,8 +32,8 @@ cOsd *cNopacityDisplayMenuView::createOsd(void) {
}
void cNopacityDisplayMenuView::SetDescriptionTextWindowSize(void) {
- int xSchedules, xRecordings, xChannels;
- int widthSchedules, widthRecordings, widthChannels;
+ int xSchedules, xRecordings, xChannels, xTimers;
+ int widthSchedules, widthRecordings, widthChannels, widthTimers;
if (config.GetValue("menuAdjustLeft")) {
xSchedules = 2 * geoManager->menuSpace
+ geoManager->menuContentWidthSchedules
@@ -44,13 +44,18 @@ void cNopacityDisplayMenuView::SetDescriptionTextWindowSize(void) {
xChannels = 2 * geoManager->menuSpace
+ geoManager->menuContentWidthChannels
+ geoManager->menuWidthScrollbar;
+ xTimers = 2 * geoManager->menuSpace
+ + geoManager->menuContentWidthTimers
+ + geoManager->menuWidthScrollbar;
widthSchedules = geoManager->osdWidth - xSchedules - geoManager->menuSpace;
widthRecordings = geoManager->osdWidth - xRecordings - geoManager->menuSpace;
widthChannels = geoManager->osdWidth - xChannels - geoManager->menuSpace;
+ widthTimers = geoManager->osdWidth - xTimers - geoManager->menuSpace;
} else {
xSchedules = geoManager->menuSpace;
xRecordings = geoManager->menuSpace;
xChannels = geoManager->menuSpace;
+ xTimers = geoManager->menuSpace;
widthSchedules = geoManager->osdWidth
- geoManager->menuContentWidthSchedules
- geoManager->menuWidthScrollbar
@@ -63,6 +68,10 @@ void cNopacityDisplayMenuView::SetDescriptionTextWindowSize(void) {
- geoManager->menuContentWidthChannels
- geoManager->menuWidthScrollbar
- 2 * geoManager->menuSpace;
+ widthTimers = geoManager->osdWidth
+ - geoManager->menuContentWidthTimers
+ - geoManager->menuWidthScrollbar
+ - 2 * geoManager->menuSpace;
}
int heightFull = geoManager->menuContentHeight - 2*geoManager->menuSpace;
int height = config.GetValue("menuHeightInfoWindow") * heightFull / 100;
@@ -77,6 +86,10 @@ void cNopacityDisplayMenuView::SetDescriptionTextWindowSize(void) {
textWindowSizeRecordings = cRect(xRecordings,y,widthRecordings,height);
else
textWindowSizeRecordings = cRect(xRecordings,yFullScreen,widthRecordings,heightFull);
+ if (config.GetValue("menuTimersWindowMode") == 0)
+ textWindowSizeTimers = cRect(xTimers,y,widthTimers,height);
+ else
+ textWindowSizeTimers = cRect(xTimers,yFullScreen,widthTimers,heightFull);
textWindowSizeChannels = cRect(xChannels,y,widthChannels,height);
}
@@ -88,6 +101,8 @@ cRect *cNopacityDisplayMenuView::GetDescriptionTextWindowSize(eMenuCategory menu
return &textWindowSizeRecordings;
case mcChannel:
return &textWindowSizeChannels;
+ case mcTimer:
+ return &textWindowSizeTimers;
default:
return NULL;
}