summaryrefslogtreecommitdiff
path: root/displaymenuview.c
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2014-04-25 15:24:41 +0200
committerlouis <louis.braun@gmx.de>2014-04-25 15:24:41 +0200
commit5152d70ebc7470c3d05b75cf150244c324681a0f (patch)
tree5552dd2ce8abbc04b57394b34eb7f4de70b230a3 /displaymenuview.c
parent7662bb8fc56330023da796cfa7ba8e6d738b5915 (diff)
downloadskin-nopacity-5152d70ebc7470c3d05b75cf150244c324681a0f.tar.gz
skin-nopacity-5152d70ebc7470c3d05b75cf150244c324681a0f.tar.bz2
Version 1.1.2: Restructured detailed EPG and recordings view1.1.2
Diffstat (limited to 'displaymenuview.c')
-rw-r--r--displaymenuview.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/displaymenuview.c b/displaymenuview.c
index 09a07f2..9a94f25 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -736,7 +736,7 @@ void cNopacityDisplayMenuView::ClearMessage(void) {
}
}
-void cNopacityDisplayMenuView::SetDetailViewSize(eDetailViewType detailViewType, cNopacityMenuDetailView *detailView) {
+void cNopacityDisplayMenuView::SetDetailViewSize(eDetailViewType detailViewType, cNopacityDetailView *detailView) {
int x = (config.GetValue("menuAdjustLeft")) ? 0 : geoManager->osdWidth - geoManager->menuContentWidthFull + 2*geoManager->menuSpace;
int width = 0;
int height = 0;
@@ -744,13 +744,17 @@ void cNopacityDisplayMenuView::SetDetailViewSize(eDetailViewType detailViewType,
int contentBorder = 30;
int detailHeaderHeight = 0;
+ width = geoManager->menuContentWidthFull - 2*geoManager->menuSpace;
+ height = geoManager->menuContentHeight;
+ top = geoManager->menuHeaderHeight;
+
switch (detailViewType) {
case dvEvent:
- detailHeaderHeight = max(config.GetValue("logoHeightOriginal"), config.GetValue("epgImageHeight"))+4;
+ detailHeaderHeight = config.GetValue("headerDetailedEPG") * height / 100;
contentBorder = config.GetValue("borderDetailedEPG");
break;
case dvRecording:
- detailHeaderHeight = config.GetValue("epgImageHeight") + 4;
+ detailHeaderHeight = config.GetValue("headerDetailedRecordings") * height / 100;
contentBorder = config.GetValue("borderDetailedRecordings");
break;
case dvText:
@@ -759,8 +763,6 @@ void cNopacityDisplayMenuView::SetDetailViewSize(eDetailViewType detailViewType,
default:
break;
}
- width = geoManager->menuContentWidthFull - 2*geoManager->menuSpace;
- height = geoManager->menuContentHeight;
- top = geoManager->menuHeaderHeight;
detailView->SetGeometry(x, width, height, top, contentBorder, detailHeaderHeight);
+ detailView->SetScrollBar(pixmapScrollbar, pixmapScrollbarBack);
} \ No newline at end of file