mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-26 07:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a new GetSetting returning a reference instead of GetSettingPointer when the setting is known to exist.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D2192
This was SVN commit r22693.
This commit is contained in:
elexis
2019-08-19 10:32:29 +00:00
parent 5cfef19a06
commit 3dfa23cd25
16 changed files with 259 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/IGUIObject.cpp
+3 -4
View File
@@ -222,16 +222,15 @@ void IGUIObject::UpdateCachedSize()
float aspectratio = 0.f;
GUI<float>::GetSetting(this, "aspectratio", aspectratio);
CClientArea* ca;
GUI<CClientArea>::GetSettingPointer(this, "size", ca);
const CClientArea& ca = GUI<CClientArea>::GetSetting(this, "size");
// If absolute="false" and the object has got a parent,
// use its cached size instead of the screen. Notice
// it must have just been cached for it to work.
if (absolute == false && m_pParent && !IsRootObject())
m_CachedActualSize = ca->GetClientArea(m_pParent->m_CachedActualSize);
m_CachedActualSize = ca.GetClientArea(m_pParent->m_CachedActualSize);
else
m_CachedActualSize = ca->GetClientArea(CRect(0.f, 0.f, g_xres / g_GuiScale, g_yres / g_GuiScale));
m_CachedActualSize = ca.GetClientArea(CRect(0.f, 0.f, g_xres / g_GuiScale, g_yres / g_GuiScale));
// In a few cases, GUI objects have to resize to fill the screen
// but maintain a constant aspect ratio.