The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-12-25 03:11:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

-moved banner correctly into top right corner

Browse Source 
-dont display game name if banner is displayed
This commit is contained in:
fix94.1 2012-07-03 19:12:29 +00:00
parent e4b7226672
commit a833819ad8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/banner/BannerWindow.cpp
View File

@ -142,10 +142,10 @@ void BannerWindow::Animate(void)
f32 ratioX = xDiff * 2.f / iconWidth; f32 ratioX = xDiff * 2.f / iconWidth;
f32 ratioY = yDiff * 2.f / iconHeight; f32 ratioY = yDiff * 2.f / iconHeight;
stepx1 = ((ScreenProps.x * 0.1f - xDiff) - (AnimPosX + 0.1f * fIconWidth - 0.1f * iconWidth)) * ratioX; stepx1 = ((ScreenProps.x * 0.1f - xDiff) - (AnimPosX + 0.5f * fIconWidth - 0.5f * iconWidth)) * ratioX;
stepx2 = ((ScreenProps.x * 0.1f + xDiff) - (AnimPosX + 0.1f * fIconWidth + 0.1f * iconWidth)) * ratioX; stepx2 = ((ScreenProps.x * 0.1f + xDiff) - (AnimPosX + 0.5f * fIconWidth + 0.5f * iconWidth)) * ratioX;
stepy1 = ((ScreenProps.y * 0.7f - yDiff) - (AnimPosY + 0.7f * fIconHeight - 0.7f * iconHeight)) * ratioY; stepy1 = ((ScreenProps.y * 0.9f - yDiff) - (AnimPosY + 0.5f * fIconHeight - 0.5f * iconHeight)) * ratioY;
stepy2 = ((ScreenProps.y * 0.7f + yDiff) - (AnimPosY + 0.7f * fIconHeight + 0.7f * iconHeight)) * ratioY; stepy2 = ((ScreenProps.y * 0.9f + yDiff) - (AnimPosY + 0.5f * fIconHeight + 0.5f * iconHeight)) * ratioY;
//! This works good for banners //! This works good for banners
top = (ScreenProps.y * 0.5f - yDiff) + stepy1 * curAnimStep; top = (ScreenProps.y * 0.5f - yDiff) + stepy1 * curAnimStep;

2
source/menu/menu.cpp
View File

@ -1741,6 +1741,7 @@ void CMenu::_mainLoopCommon(bool withCF, bool blockReboot, bool adjusting)
m_cf.draw(); m_cf.draw();
m_vid.setup2DProjection(false, true); m_vid.setup2DProjection(false, true);
m_cf.drawEffect(); m_cf.drawEffect();
if(!m_banner.GetSelectedGame())
m_cf.drawText(adjusting); m_cf.drawText(adjusting);
m_vid.renderAAPass(i); m_vid.renderAAPass(i);
} }
@ -1758,6 +1759,7 @@ void CMenu::_mainLoopCommon(bool withCF, bool blockReboot, bool adjusting)
m_cf.draw(); m_cf.draw();
m_vid.setup2DProjection(); m_vid.setup2DProjection();
m_cf.drawEffect(); m_cf.drawEffect();
if(!m_banner.GetSelectedGame())
m_cf.drawText(adjusting); m_cf.drawText(adjusting);
} }
} }