mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 17:29:10 +00:00
CHANGED: #1471 CInterfaceGroup no longer depends on CGroupScrollText.
--HG-- branch : gui-refactoring
This commit is contained in:
parent
2e9779a591
commit
6f591808b0
3 changed files with 6 additions and 5 deletions
|
@ -45,6 +45,7 @@ CGroupScrollText::CGroupScrollText(const TCtorParam ¶m) :
|
|||
_StartHeight(0),
|
||||
_EllapsedTime(0)
|
||||
{
|
||||
_IsGroupScrollText = true;
|
||||
}
|
||||
|
||||
//========================================================================
|
||||
|
|
|
@ -23,10 +23,7 @@
|
|||
#include "interface_group.h"
|
||||
#include "interface_link.h"
|
||||
#include "widget_manager.h"
|
||||
|
||||
#include "ctrl_scroll_base.h"
|
||||
#include "group_editbox.h"
|
||||
#include "group_scrolltext.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
|
||||
using namespace std;
|
||||
|
@ -57,6 +54,7 @@ CInterfaceGroup::CInterfaceGroup(const TCtorParam ¶m) : CCtrlBase(param)
|
|||
_Priority= WIN_PRIORITY_NORMAL;
|
||||
_UseCursor = true;
|
||||
_IsGroupContainer = false;
|
||||
_IsGroupScrollText = false;
|
||||
_AHOnActive = NULL;
|
||||
_AHOnDeactive = NULL;
|
||||
_AHOnLeftClick = NULL;
|
||||
|
@ -973,7 +971,7 @@ void CInterfaceGroup::evalChildrenBBox(bool resizeFromChildW, bool resizeFromChi
|
|||
// If it is a group, minimize with MaxHReal / MaxWReal
|
||||
const CInterfaceGroup *sonGroup= dynamic_cast<const CInterfaceGroup*>(pIE);
|
||||
// \todo yoyo: do not know why but don't work if this==scroll_text
|
||||
if(sonGroup && !dynamic_cast<const CGroupScrollText*>(this))
|
||||
if(sonGroup && !isGroupScrollText())
|
||||
{
|
||||
sint32 oldSciX= -16384;
|
||||
sint32 oldSciY= -16384;
|
||||
|
|
|
@ -248,6 +248,7 @@ public:
|
|||
|
||||
// quick way to know if the group is a CGroupContainer
|
||||
bool isGroupContainer() const { return _IsGroupContainer; }
|
||||
bool isGroupScrollText() const{ return _IsGroupScrollText; }
|
||||
|
||||
CInterfaceGroup* getEnclosingContainer();
|
||||
|
||||
|
@ -345,6 +346,7 @@ protected:
|
|||
bool _Escapable : 1;
|
||||
bool _UseCursor : 1;
|
||||
bool _IsGroupContainer : 1; // faster than a virual call
|
||||
bool _IsGroupScrollText : 1;
|
||||
bool _NeedFrameUpdatePos : 1; // typically For CGroupInScene
|
||||
sint32 _ResizeFromChildWMargin;
|
||||
sint32 _ResizeFromChildHMargin;
|
||||
|
|
Loading…
Reference in a new issue