mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use new class to fade

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1949 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-06 13:35:26 +00:00
parent 1922213fc4
commit 725da8ec70
1 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/gui/dboxinfo.cpp
View File

@@ -48,6 +48,7 @@
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/rcinput.h> #include <driver/rcinput.h>
#include <driver/fade.h>
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include <sys/vfs.h> #include <sys/vfs.h>
@@ -77,17 +78,8 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
{ {
parent->hide(); parent->hide();
} }
COSDFader fader(g_settings.menu_Content_alpha);
bool fadeIn = g_settings.widget_fade; fader.StartFadeIn();
bool fadeOut = false;
int fadeValue = g_settings.menu_Content_alpha;
uint32_t fadeTimer = 0;
if ( fadeIn ) {
fadeValue = 100;
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue, fadeValue);
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
}
paint(); paint();
@@ -107,38 +99,15 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
{ {
g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fadeTimer)) { if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) {
if (fadeOut) { // disappear if(fader.Fade())
fadeValue += FADE_STEP; doLoop = false;
if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
doLoop = false;
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
} else { // appears
fadeValue -= FADE_STEP;
if (fadeValue <= g_settings.menu_Content_alpha) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
fadeIn = false;
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
}
} }
else if ( ( msg == CRCInput::RC_timeout ) || else if ( ( msg == CRCInput::RC_timeout ) ||
( msg == CRCInput::RC_home ) || ( msg == CRCInput::RC_home ) ||
( msg == CRCInput::RC_ok ) ) { ( msg == CRCInput::RC_ok ) ) {
if ( fadeIn ) { if(fader.StartFadeOut()) {
g_RCInput->killTimer(fadeTimer);
fadeIn = false;
}
if ((!fadeOut) && g_settings.widget_fade) {
fadeOut = true;
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
msg = 0; msg = 0;
} else } else
doLoop = false; doLoop = false;
@@ -173,10 +142,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
} }
hide(); hide();
if ( fadeIn || fadeOut ) { fader.Stop();
g_RCInput->killTimer(fadeTimer);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}
return res; return res;
} }