fixed bug that time was not correctly drawn if a submenu implements its own time display

This commit is contained in:
louis
2015-04-03 15:42:08 +02:00
parent 54ca48045a
commit f1d5367a53
6 changed files with 15 additions and 6 deletions

View File

@@ -29,6 +29,7 @@ cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(root
defaultHeaderDrawn = false;
defaultButtonsDrawn = false;
defaultDateTimeDrawn = false;
defaultTimeDrawn = false;
defaultMessageDrawn = false;
defaultSortmodeDrawn = false;
DeleteOsdOnExit();
@@ -364,6 +365,8 @@ void cDisplayMenuRootView::ClearRootView(void) {
ClearViewElement(veButtons);
if (defaultDateTimeDrawn)
ClearViewElement(veDateTime);
if (defaultTimeDrawn)
ClearViewElement(veTime);
if (defaultMessageDrawn)
ClearViewElement(veMessage);
if (defaultSortmodeDrawn)
@@ -468,9 +471,12 @@ bool cDisplayMenuRootView::RenderDynamicElements(void) {
if (!view)
return false;
bool updated = false;
if (view->DrawTime()) {
bool implemented = false;
if (view->DrawTime(implemented)) {
defaultTimeDrawn = false;
updated = true;
} else if (DrawTime()) {
} else if (!implemented && DrawTime()) {
defaultTimeDrawn = true;
updated = true;
}
if (view->DrawDynamicViewElements()){