mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
fixed flickering when main menu is fading
This commit is contained in:
parent
bffafedbd3
commit
dc2aefa7c1
1
HISTORY
1
HISTORY
@ -390,3 +390,4 @@ Version 0.6.0
|
|||||||
Version 0.6.1
|
Version 0.6.1
|
||||||
|
|
||||||
- changed skinrepository from static file to github repository
|
- changed skinrepository from static file to github repository
|
||||||
|
- fixed flickering when main menu is fading
|
||||||
|
@ -14,7 +14,7 @@ cSDDisplayMenu::cSDDisplayMenu(cTemplate *menuTemplate) {
|
|||||||
doOutput = false;
|
doOutput = false;
|
||||||
dsyslog("skindesigner: displayMenu no valid template - aborting");
|
dsyslog("skindesigner: displayMenu no valid template - aborting");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
rootView = new cDisplayMenuRootView(menuTemplate->GetRootView());
|
rootView = new cDisplayMenuRootView(menuTemplate->GetRootView());
|
||||||
if (!rootView->createOsd()) {
|
if (!rootView->createOsd()) {
|
||||||
doOutput = false;
|
doOutput = false;
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "../libcore/helpers.h"
|
#include "../libcore/helpers.h"
|
||||||
|
|
||||||
cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(rootView) {
|
cDisplayMenuRootView::cDisplayMenuRootView(cTemplateView *rootView) : cView(rootView) {
|
||||||
|
fadeOut = false;
|
||||||
cat = mcUndefined;
|
cat = mcUndefined;
|
||||||
selectedPluginMainMenu = "";
|
selectedPluginMainMenu = "";
|
||||||
sortMode = msmUnknown;
|
sortMode = msmUnknown;
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
cDisplayMenuView::cDisplayMenuView(cTemplateView *tmplView, bool menuInit) : cView(tmplView) {
|
cDisplayMenuView::cDisplayMenuView(cTemplateView *tmplView, bool menuInit) : cView(tmplView) {
|
||||||
if (!menuInit)
|
if (!menuInit)
|
||||||
SetFadeTime(0);
|
SetFadeTime(0);
|
||||||
|
fadeOut = false;
|
||||||
cat = mcUndefined;
|
cat = mcUndefined;
|
||||||
sortMode = msmUnknown;
|
sortMode = msmUnknown;
|
||||||
sortModeLast = msmUnknown;
|
sortModeLast = msmUnknown;
|
||||||
@ -283,7 +284,6 @@ cDisplayMenuMainView::cDisplayMenuMainView(cTemplateView *tmplView, bool menuIni
|
|||||||
|
|
||||||
cDisplayMenuMainView::~cDisplayMenuMainView() {
|
cDisplayMenuMainView::~cDisplayMenuMainView() {
|
||||||
CancelSave();
|
CancelSave();
|
||||||
FadeOut();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void cDisplayMenuMainView::DrawStaticViewElements(void) {
|
void cDisplayMenuMainView::DrawStaticViewElements(void) {
|
||||||
@ -628,7 +628,6 @@ cDisplayMenuSchedulesView::cDisplayMenuSchedulesView(cTemplateView *tmplView, eM
|
|||||||
|
|
||||||
cDisplayMenuSchedulesView::~cDisplayMenuSchedulesView() {
|
cDisplayMenuSchedulesView::~cDisplayMenuSchedulesView() {
|
||||||
CancelSave();
|
CancelSave();
|
||||||
FadeOut();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cDisplayMenuSchedulesView::DrawHeader(void) {
|
bool cDisplayMenuSchedulesView::DrawHeader(void) {
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include "displaypluginview.h"
|
#include "displaypluginview.h"
|
||||||
|
|
||||||
cDisplayPluginView::cDisplayPluginView(cTemplateView *tmplView, bool isRootView) : cView(tmplView) {
|
cDisplayPluginView::cDisplayPluginView(cTemplateView *tmplView, bool isRootView) : cView(tmplView) {
|
||||||
|
fadeOut = false;
|
||||||
init = true;
|
init = true;
|
||||||
tabInit = true;
|
tabInit = true;
|
||||||
tabScrolled = true;
|
tabScrolled = true;
|
||||||
@ -281,8 +282,7 @@ void cDisplayPluginView::DrawTabLabels(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cDisplayPluginView::Action(void) {
|
void cDisplayPluginView::Action(void) {
|
||||||
SetInitFinished();
|
if (!init)
|
||||||
FadeIn();
|
SetFadeTime(0);
|
||||||
DoFlush();
|
|
||||||
cView::Action();
|
cView::Action();
|
||||||
}
|
}
|
@ -58,8 +58,9 @@ cView::~cView() {
|
|||||||
if (fadeOut) {
|
if (fadeOut) {
|
||||||
if (IsAnimated())
|
if (IsAnimated())
|
||||||
ShiftOut();
|
ShiftOut();
|
||||||
else
|
else {
|
||||||
FadeOut();
|
FadeOut();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user