frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

fixed bug that x and y of subviews was not respected

Browse Source
This commit is contained in:
louis 2014-10-25 11:38:39 +02:00
parent 69af1d531e
commit fa90ab746d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -29,4 +29,5 @@ Version 0.0.2
- display always newest recording of folders in recordings list, thanks@ Lars Hanisch for providing the patch - display always newest recording of folders in recordings list, thanks@ Lars Hanisch for providing the patch
- added extented recording information - added extented recording information
- added token {nummenuitem} as number of item for every list, value starts with 1 - 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

13
libtemplate/templateview.c
View File

@ -352,7 +352,11 @@ void cTemplateView::PreCache(bool isSubview) {
for (map < eViewElement, cTemplateViewElement* >::iterator it = viewElements.begin(); it != viewElements.end(); it++) { for (map < eViewElement, cTemplateViewElement* >::iterator it = viewElements.begin(); it != viewElements.end(); it++) {
cTemplateViewElement *viewElement = it->second; cTemplateViewElement *viewElement = it->second;
viewElement->SetGlobals(globals); 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->CalculatePixmapParameters();
viewElement->SetPixOffset(pixOffset); viewElement->SetPixOffset(pixOffset);
pixOffset += viewElement->GetNumPixmaps(); pixOffset += viewElement->GetNumPixmaps();
@ -362,13 +366,16 @@ void cTemplateView::PreCache(bool isSubview) {
for (map < eViewList, cTemplateViewList* >::iterator it = viewLists.begin(); it != viewLists.end(); it++) { for (map < eViewList, cTemplateViewList* >::iterator it = viewLists.begin(); it != viewLists.end(); it++) {
cTemplateViewList *viewList = it->second; cTemplateViewList *viewList = it->second;
viewList->SetGlobals(globals); viewList->SetGlobals(globals);
viewList->SetContainer(0, 0, osdWidth, osdHeight); //viewlists are only in subviews
viewList->SetContainer(osdX, osdY, osdWidth, osdHeight);
viewList->CalculateParameters();
viewList->CalculateListParameters(); viewList->CalculateListParameters();
} }
//Cache ViewTabs //Cache ViewTabs
for (vector<cTemplateViewTab*>::iterator tab = viewTabs.begin(); tab != viewTabs.end(); tab++) { for (vector<cTemplateViewTab*>::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)->SetGlobals(globals);
(*tab)->CalculateParameters(); (*tab)->CalculateParameters();
} }