mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-05 23:09:04 +00:00
CHANGED: #1471 CCtrlTextButton no longer depends on CGroupContainer.
--HG-- branch : gui-refactoring
This commit is contained in:
parent
90a1049934
commit
040eaad94c
3 changed files with 8 additions and 16 deletions
|
@ -19,6 +19,7 @@
|
|||
#define GROUP_CONTAINER_BASE_H
|
||||
|
||||
#include "nel/gui/interface_group.h"
|
||||
#include "nel/misc/rgba.h"
|
||||
|
||||
namespace NLGUI
|
||||
{
|
||||
|
@ -76,7 +77,10 @@ namespace NLGUI
|
|||
REFLECT_STRING("on_alpha_settings_changed_aparams", getAHOnAlphaSettingsChangedParams, setAHOnAlphaSettingsChangedParams);
|
||||
REFLECT_EXPORT_END
|
||||
|
||||
virtual bool isMoving() const{ return false; }
|
||||
virtual bool isMoving() const{ return false; }
|
||||
|
||||
// Get the header color draw. NB: depends if grayed, and if active.
|
||||
virtual NLMISC::CRGBA getDrawnHeaderColor () const{ return NLMISC::CRGBA(); };
|
||||
|
||||
protected:
|
||||
void triggerAlphaSettingsChangedAH();
|
||||
|
|
|
@ -14,23 +14,14 @@
|
|||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#include "stdpch.h"
|
||||
|
||||
#include "ctrl_text_button.h"
|
||||
#include "interface_manager.h"
|
||||
#include "nel/misc/xml_auto_ptr.h"
|
||||
#include "nel/gui/view_text.h"
|
||||
#include "nel/gui/view_text_id.h"
|
||||
#include "group_container.h"
|
||||
#include "nel/gui/group_container_base.h"
|
||||
#include "nel/gui/lua_ihm.h"
|
||||
#include "lua_ihm_ryzom.h"
|
||||
#include "nel/gui/widget_manager.h"
|
||||
|
||||
|
||||
// ***************************************************************************
|
||||
using namespace std;
|
||||
using namespace NLMISC;
|
||||
using namespace NL3D;
|
||||
|
@ -69,7 +60,6 @@ CCtrlTextButton::CCtrlTextButton(const TCtorParam ¶m)
|
|||
bool CCtrlTextButton::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
|
||||
{
|
||||
CXMLAutoPtr prop;
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
CViewRenderer &rVR = *CViewRenderer::getInstance();
|
||||
|
||||
//try to get props that can be inherited from groups
|
||||
|
@ -272,7 +262,6 @@ void CCtrlTextButton::draw ()
|
|||
CViewRenderer::CTextureId *pTxId = NULL;
|
||||
CRGBA color;
|
||||
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
CViewRenderer &rVR = *CViewRenderer::getInstance();
|
||||
CRGBA globalColor= CWidgetManager::getInstance()->getGlobalColorForContent();
|
||||
|
||||
|
@ -392,7 +381,7 @@ void CCtrlTextButton::draw ()
|
|||
CInterfaceGroup *pIG= getRootWindow();
|
||||
if(pIG->isGroupContainer())
|
||||
{
|
||||
CGroupContainer *pGC= static_cast<CGroupContainer*>(pIG);
|
||||
CGroupContainerBase *pGC = static_cast<CGroupContainerBase*>(pIG);
|
||||
viewTextColor= pGC->getDrawnHeaderColor();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,7 +28,6 @@ namespace NLGUI
|
|||
class CEventDescriptor;
|
||||
class CViewText;
|
||||
}
|
||||
class CInterfaceManager;
|
||||
|
||||
// ***************************************************************************
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue