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

Updates, mostly about centering text.

Browse Source 
This was SVN commit r1099.
This commit is contained in:
Gee
2004-09-02 03:02:32 +00:00
parent 72e730be3a
commit f2a615f0a3
16 changed files with 187 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/IGUIObject.cpp
+8 -4
View File
@@ -71,6 +71,8 @@ IGUIObject::~IGUIObject()
TYPE(CClientArea);
TYPE(CGUIString);
TYPE(CStr);
TYPE(EAlign);
TYPE(EVAlign);
default:
assert(!"Invalid setting type");
}
@@ -169,11 +171,11 @@ void IGUIObject::AddSetting(const EGUISettingType &Type, const CStr& Name)
CASE_TYPE(CStr)
CASE_TYPE(CColor)
CASE_TYPE(CGUIString)
CASE_TYPE(EAlign)
CASE_TYPE(EVAlign)
default:
debug_warn("IGUIObject::AddSetting failed");
// TODO Gee: Report in log, type is not recognized. This should be an assert, not in log
// because it's strictly hardcoded error
debug_warn("IGUIObject::AddSetting failed, type not recognized!");
break;
}
}
@@ -262,6 +264,8 @@ void IGUIObject::SetSetting(const CStr& Setting, const CStr& Value)
ADD_TYPE(CColor, "color")
ADD_TYPE(CClientArea, "client area")
ADD_TYPE(CGUIString, "text")
ADD_TYPE(EAlign, "align")
ADD_TYPE(EVAlign, "valign")
else
{
throw PS_FAIL;
@@ -329,7 +333,7 @@ void IGUIObject::UpdateCachedSize()
if (absolute == false && m_pParent)
m_CachedActualSize = ca.GetClientArea(m_pParent->m_CachedActualSize);
else
m_CachedActualSize = ca.GetClientArea(CRect(0, 0, g_xres, g_yres));
m_CachedActualSize = ca.GetClientArea(CRect(0.f, 0.f, (float)g_xres, (float)g_yres));
}