no message
This was SVN commit r94.
This commit is contained in:
parent
5736482af1
commit
953f72a91c
@ -81,6 +81,8 @@ public:
|
||||
*/
|
||||
virtual map_Settings GetSettingsInfo() const { return IGUISettingsObject<SButtonSettings>::m_SettingsInfo; }
|
||||
|
||||
virtual void ResetStates() { IGUIButtonBehavior::ResetStates(); }
|
||||
|
||||
/**
|
||||
* Handle Messages
|
||||
*
|
||||
|
@ -55,7 +55,7 @@ bool CClientArea::SetClientArea(const CStr &Value)
|
||||
// (200) (percent) (100) <== percent PLUS pixel
|
||||
// (200) (percent) (-100) <== percent MINUS pixel
|
||||
// (200) (percent) (100) (-100) <== Both PLUS and MINUS are used, INVALID
|
||||
string one_value = "_$value[$arg(percent)%_[+_$value]_[-_$arg(_minus)$value]_]";
|
||||
string one_value = "_[-_$arg(_minus)]$value[$arg(percent)%_[+_$value]_[-_$arg(_minus)$value]_]";
|
||||
string four_values = one_value + "$arg(delim)" +
|
||||
one_value + "$arg(delim)" +
|
||||
one_value + "$arg(delim)" +
|
||||
@ -167,3 +167,8 @@ const IGUIObject * CInternalCGUIAccessorBase::GetObjectPointer(const CGUI &GUIin
|
||||
|
||||
return GUIinstance.m_pAllObjects.find(Object)->second;
|
||||
}
|
||||
|
||||
void CInternalCGUIAccessorBase::QueryResetting(IGUIObject *pObject)
|
||||
{
|
||||
GUI<>::RecurseObject(0, pObject, IGUIObject::ResetStates);
|
||||
}
|
||||
|
@ -123,6 +123,9 @@ protected:
|
||||
|
||||
/// const version
|
||||
static const IGUIObject * GetObjectPointer(const CGUI &GUIinstance, const CStr &Object);
|
||||
|
||||
/// Wrapper for ResetStates
|
||||
static void QueryResetting(IGUIObject *pObject);
|
||||
};
|
||||
|
||||
|
||||
@ -141,6 +144,7 @@ class GUI : public CInternalCGUIAccessorBase
|
||||
// Private functions further ahead
|
||||
friend class CGUI;
|
||||
friend class IGUIObject;
|
||||
friend class CInternalCGUIAccessorBase;
|
||||
|
||||
public:
|
||||
/**
|
||||
@ -200,7 +204,8 @@ public:
|
||||
if (Setting == CStr(_T("hidden")))
|
||||
{
|
||||
// Hiding an object requires us to reset it and all children
|
||||
RecurseObject(0, pObject, IGUIObject::ResetStates);
|
||||
QueryResetting(pObject);
|
||||
//RecurseObject(0, pObject, IGUIObject::ResetStates);
|
||||
}
|
||||
|
||||
return PS_OK;
|
||||
|
@ -136,14 +136,10 @@ bool IGUIObject::MouseOver()
|
||||
u16 mouse_x = GetMouseX(),
|
||||
mouse_y = GetMouseY();
|
||||
|
||||
//CRect ca = m_BaseSettings.m_Size.GetClientArea(CRect(0,0,g_xres,g_yres));
|
||||
CRect ca = m_CachedActualSize;
|
||||
|
||||
|
||||
return (mouse_x >= ca.left &&
|
||||
mouse_x <= ca.right &&
|
||||
mouse_y >= ca.top &&
|
||||
mouse_y <= ca.bottom);
|
||||
return (mouse_x >= m_CachedActualSize.left &&
|
||||
mouse_x <= m_CachedActualSize.right &&
|
||||
mouse_y >= m_CachedActualSize.top &&
|
||||
mouse_y <= m_CachedActualSize.bottom);
|
||||
}
|
||||
|
||||
u16 IGUIObject::GetMouseX() const
|
||||
|
@ -105,6 +105,7 @@ class IGUIObject
|
||||
{
|
||||
friend class CGUI;
|
||||
|
||||
friend class CInternalCGUIAccessorBase;
|
||||
#ifndef _MSC_VER
|
||||
template <class T>
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user