diff options
| author | jmarshallnz <jmarshallnz@svn> | 2009-09-24 01:04:35 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2009-09-24 01:04:35 +0000 |
| commit | 9cffa27f00de6c87ee6eafbf5531a620e2840c89 (patch) | |
| tree | e650cdc22b791e6aa9d04d2a0191f938471f6156 /guilib/GUIWindow.cpp | |
| parent | 7d4c7b70bff223fdd55aa9713466071735039576 (diff) | |
removed: FRECT struct - use CRect instead.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23127 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIWindow.cpp')
| -rw-r--r-- | guilib/GUIWindow.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/guilib/GUIWindow.cpp b/guilib/GUIWindow.cpp index f68d72a034..af99dfd336 100644 --- a/guilib/GUIWindow.cpp +++ b/guilib/GUIWindow.cpp @@ -173,7 +173,7 @@ bool CGUIWindow::Load(TiXmlDocument &xmlDoc) } else if (strValue == "animation" && pChild->FirstChild()) { - FRECT rect = { 0, 0, (float)g_settings.m_ResInfo[m_coordsRes].iWidth, (float)g_settings.m_ResInfo[m_coordsRes].iHeight }; + CRect rect(0, 0, (float)g_settings.m_ResInfo[m_coordsRes].iWidth, (float)g_settings.m_ResInfo[m_coordsRes].iHeight); CAnimation anim; anim.Create(pChild, rect); m_animations.push_back(anim); @@ -250,13 +250,13 @@ void CGUIWindow::LoadControl(TiXmlElement* pControl, CGUIControlGroup *pGroup) // get control type CGUIControlFactory factory; - FRECT rect = { 0, 0, (float)g_settings.m_ResInfo[m_coordsRes].iWidth, (float)g_settings.m_ResInfo[m_coordsRes].iHeight }; + CRect rect(0, 0, (float)g_settings.m_ResInfo[m_coordsRes].iWidth, (float)g_settings.m_ResInfo[m_coordsRes].iHeight); if (pGroup) { - rect.left = pGroup->GetXPosition(); - rect.top = pGroup->GetYPosition(); - rect.right = rect.left + pGroup->GetWidth(); - rect.bottom = rect.top + pGroup->GetHeight(); + rect.x1 = pGroup->GetXPosition(); + rect.y1 = pGroup->GetYPosition(); + rect.x2 = rect.x1 + pGroup->GetWidth(); + rect.y2 = rect.y2 + pGroup->GetHeight(); } CGUIControl* pGUIControl = factory.Create(GetID(), rect, pControl); if (pGUIControl) @@ -868,14 +868,14 @@ void CGUIWindow::SetDefaults() m_animationsEnabled = true; } -FRECT CGUIWindow::GetScaledBounds() const +CRect CGUIWindow::GetScaledBounds() const { CSingleLock lock(g_graphicsContext); g_graphicsContext.SetScalingResolution(m_coordsRes, m_posX, m_posY, m_needsScaling); - FRECT rect = {0, 0, m_width, m_height}; + CRect rect(0, 0, m_width, m_height); float z = 0; - g_graphicsContext.ScaleFinalCoords(rect.left, rect.top, z); - g_graphicsContext.ScaleFinalCoords(rect.right, rect.bottom, z); + g_graphicsContext.ScaleFinalCoords(rect.x1, rect.y1, z); + g_graphicsContext.ScaleFinalCoords(rect.x2, rect.y2, z); return rect; } |