diff --git a/HISTORY b/HISTORY index 7f7b6cc..cab68e2 100644 --- a/HISTORY +++ b/HISTORY @@ -29,4 +29,5 @@ Version 0.0.2 - display always newest recording of folders in recordings list, thanks@ Lars Hanisch for providing the patch - added extented recording information - added token {nummenuitem} as number of item for every list, value starts with 1 +- fixed bug that x and y of subviews was not respected diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c index ea77b77..37bb13b 100644 --- a/libtemplate/templateview.c +++ b/libtemplate/templateview.c @@ -352,7 +352,11 @@ void cTemplateView::PreCache(bool isSubview) { for (map < eViewElement, cTemplateViewElement* >::iterator it = viewElements.begin(); it != viewElements.end(); it++) { cTemplateViewElement *viewElement = it->second; viewElement->SetGlobals(globals); - viewElement->SetContainer(0, 0, osdWidth, osdHeight); + if (!isSubview) + viewElement->SetContainer(0, 0, osdWidth, osdHeight); + else + viewElement->SetContainer(osdX, osdY, osdWidth, osdHeight); + viewElement->CalculateParameters(); viewElement->CalculatePixmapParameters(); viewElement->SetPixOffset(pixOffset); pixOffset += viewElement->GetNumPixmaps(); @@ -362,13 +366,16 @@ void cTemplateView::PreCache(bool isSubview) { for (map < eViewList, cTemplateViewList* >::iterator it = viewLists.begin(); it != viewLists.end(); it++) { cTemplateViewList *viewList = it->second; viewList->SetGlobals(globals); - viewList->SetContainer(0, 0, osdWidth, osdHeight); + //viewlists are only in subviews + viewList->SetContainer(osdX, osdY, osdWidth, osdHeight); + viewList->CalculateParameters(); viewList->CalculateListParameters(); } //Cache ViewTabs for (vector::iterator tab = viewTabs.begin(); tab != viewTabs.end(); tab++) { - (*tab)->SetContainer(containerX, containerY, containerWidth, containerHeight); + //viewtabs are only in subviews + (*tab)->SetContainer(osdX, osdY, osdWidth, osdHeight); (*tab)->SetGlobals(globals); (*tab)->CalculateParameters(); }