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

Fade changes for new fb driver

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1413 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-04-23 10:24:09 +00:00
parent d570d0c7d2
commit 1df85f6ea3
12 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/widget/menue.cpp
View File

@@ -376,6 +376,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
int fadeValue = g_settings.menu_Content_alpha;
if ( fadeIn ) {
fadeValue = 100;
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue, fadeValue);
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
}
@@ -440,7 +441,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
g_RCInput->killTimer (fadeTimer);
fadeTimer = 0;
fadeIn = false;
frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
} else
frameBuffer->setBlendLevel(fadeValue, fadeValue);
}
@@ -563,7 +565,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
fadeIn = false;
frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}
int rv = item->exec( this );
switch ( rv ) {
@@ -616,6 +619,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
fadeOut = true;
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
msg = 0;
continue;
}
@@ -634,7 +638,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
fadeTimer = 0;
frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
frameBuffer->setBlendMode(1); // Set back to per pixel alpha
}
if(!parent)