mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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@1943 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1b6c7b4713
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-06 (Tue, 06 Dec 2011)
This commit is contained in:
[CST] Focus
2011-12-06 12:39:37 +00:00
parent 02e2745f22
commit 481aac5069
1 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gui/pluginlist.cpp
View File

@@ -55,6 +55,7 @@
#include <plugins.h> #include <plugins.h>
#include <driver/encoding.h> #include <driver/encoding.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/fade.h>
#include <zapit/client/zapittools.h> #include <zapit/client/zapittools.h>
@@ -136,16 +137,8 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
} }
} }
bool fadeIn = g_settings.widget_fade; COSDFader fader(g_settings.menu_Content_alpha);
bool fadeOut = false; fader.StartFadeIn();
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();
@@ -159,38 +152,16 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
if ( msg <= CRCInput::RC_MaxRC ) if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fadeTimer)) { if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) {
if (fadeOut) { // disappear if(fader.Fade()) {
fadeValue += FADE_STEP; loop = false;
if (fadeValue >= 100) {
fadeValue = g_settings.menu_Content_alpha;
g_RCInput->killTimer (fadeTimer);
loop = 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 == (neutrino_msg_t)g_settings.key_channelList_cancel ) ) ( msg == (neutrino_msg_t)g_settings.key_channelList_cancel ) )
{ {
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
loop=false; loop=false;
@@ -279,10 +250,8 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
} }
} }
hide(); hide();
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); fader.Stop();
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}
return res; return res;
} }