mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-30 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unfriend the 20 IGUIObject classes from CGUI.

Browse Source 
Improves separation of concerns and makes the code less error prone,
since the IGUIObject classes can't break CGUI private members without
CGUIs help anymore.

This is achieved by making CGUI GetFocusedObject, UpdateObjects public,
by introducing public CGUI GetBaseObject, GetMousePos, GetMouseButtons,
HasStyle, GetStyle getters,
and by removing the pointless IGUIObject GetMousePos proxy.

Delete GetGUI() checks that are either always or never true following
2c47fbd66a.
Use const references instead of copies for some mouse positions.

Differential Revision: https://code.wildfiregames.com/D2166
This was SVN commit r22641.
This commit is contained in:
elexis
2019-08-10 12:51:27 +00:00
parent ca00267faf
commit d3e56f0f57
20 changed files with 61 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/IGUIObject.cpp
+12 -34
View File
@@ -70,11 +70,6 @@ void IGUIObject::AddChild(IGUIObject* pChild)
m_Children.push_back(pChild);
// If this (not the child) object is already attached
// to a CGUI, it pGUI pointer will be non-null.
// This will mean we'll have to check if we're using
// names already used.
if (pChild->GetGUI())
{
try
{
@@ -135,10 +130,7 @@ void IGUIObject::AddSetting(const CStr& Name)
bool IGUIObject::MouseOver()
{
if (!GetGUI())
throw PSERROR_GUI_OperationNeedsGUIObject();
return m_CachedActualSize.PointInside(GetMousePos());
return m_CachedActualSize.PointInside(m_pGUI->GetMousePos());
}
bool IGUIObject::MouseOverIcon()
@@ -146,14 +138,6 @@ bool IGUIObject::MouseOverIcon()
return false;
}
CPos IGUIObject::GetMousePos() const
{
if (GetGUI())
return GetGUI()->m_MousePos;
return CPos();
}
void IGUIObject::UpdateMouseOver(IGUIObject* const& pMouseOver)
{
if (pMouseOver == this)
@@ -269,17 +253,12 @@ void IGUIObject::UpdateCachedSize()
}
}
void IGUIObject::LoadStyle(CGUI& GUIinstance, const CStr& StyleName)
void IGUIObject::LoadStyle(CGUI& pGUI, const CStr& StyleName)
{
// Fetch style
if (GUIinstance.m_Styles.count(StyleName) == 1)
{
LoadStyle(GUIinstance.m_Styles[StyleName]);
}
if (pGUI.HasStyle(StyleName))
LoadStyle(pGUI.GetStyle(StyleName));
else
{
debug_warn(L"IGUIObject::LoadStyle failed");
}
}
void IGUIObject::LoadStyle(const SGUIStyle& Style)
@@ -325,9 +304,6 @@ float IGUIObject::GetBufferedZ() const
void IGUIObject::RegisterScriptHandler(const CStr& Action, const CStr& Code, CGUI* pGUI)
{
if(!GetGUI())
throw PSERROR_GUI_OperationNeedsGUIObject();
JSContext* cx = pGUI->GetScriptInterface()->GetContext();
JSAutoRequest rq(cx);
JS::RootedValue globalVal(cx, pGUI->GetGlobalObject());
@@ -396,11 +372,13 @@ void IGUIObject::ScriptEvent(const CStr& Action)
// Set up the 'mouse' parameter
JS::RootedValue mouse(cx);
const CPos& mousePos = m_pGUI->GetMousePos();
m_pGUI->GetScriptInterface()->CreateObject(
&mouse,
"x", m_pGUI->m_MousePos.x,
"y", m_pGUI->m_MousePos.y,
"buttons", m_pGUI->m_MouseButtons);
"x", mousePos.x,
"y", mousePos.y,
"buttons", m_pGUI->GetMouseButtons());
JS::AutoValueVector paramData(cx);
paramData.append(mouse);
@@ -465,17 +443,17 @@ CStr IGUIObject::GetPresentableName() const
void IGUIObject::SetFocus()
{
GetGUI()->m_FocusedObject = this;
m_pGUI->SetFocusedObject(this);
}
bool IGUIObject::IsFocused() const
{
return GetGUI()->m_FocusedObject == this;
return m_pGUI->GetFocusedObject() == this;
}
bool IGUIObject::IsRootObject() const
{
return GetGUI() != 0 && m_pParent == GetGUI()->m_BaseObject;
return m_pParent == m_pGUI->GetBaseObject();
}
void IGUIObject::TraceMember(JSTracer* trc)