From bf7d3afd382f3327b1c58383a8ea60ae17199dbe Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Fri, 15 Jun 2012 23:30:27 +0200 Subject: [PATCH] CHANGED: #1471 CCtrlBaseButton is now part of the NLGUI namespace. --HG-- branch : gui-refactoring --- code/nel/include/nel/gui/ctrl_base_button.h | 445 ++++++----- code/nel/src/gui/ctrl_base_button.cpp | 755 +++++++++--------- .../src/interface_v3/dbgroup_build_phrase.h | 7 +- .../src/interface_v3/dbgroup_combo_box.h | 6 +- .../src/interface_v3/dbgroup_list_sheet.h | 5 +- .../src/interface_v3/dbgroup_select_number.h | 6 +- .../src/interface_v3/group_scrolltext.h | 6 +- .../src/interface_v3/interface_pointer.h | 3 +- code/ryzom/client/src/libwww.h | 6 +- 9 files changed, 635 insertions(+), 604 deletions(-) diff --git a/code/nel/include/nel/gui/ctrl_base_button.h b/code/nel/include/nel/gui/ctrl_base_button.h index 3f202dcf7..dab368293 100644 --- a/code/nel/include/nel/gui/ctrl_base_button.h +++ b/code/nel/include/nel/gui/ctrl_base_button.h @@ -22,232 +22,235 @@ #include "nel/gui/ctrl_base.h" #include "nel/gui/action_handler.h" - -// *************************************************************************** -/** - * Base Class For Buttons. - * \author Lionel Berenguier - * \author Nevrax France - * \date 2003 - */ -class CCtrlBaseButton : public CCtrlBase +namespace NLGUI { -public: - enum EType { PushButton = 0, ToggleButton, RadioButton, ButtonTypeCount }; - - /// Constructor - CCtrlBaseButton(const TCtorParam ¶m); - - virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup); - virtual bool handleEvent (const NLGUI::CEventDescriptor& event); - - /// \name Misc - // @{ - void setType (EType t) { _Type = t; } - EType getType() { return _Type; } - - void setClickWhenPushed(bool click) { _ClickWhenPushed = click; } - bool getClickWhenPushed() const { return _ClickWhenPushed; } - - void setPushed (bool state); - bool getPushed () const { return _Pushed; } - - void setFrozen (bool state); - bool getFrozen () const { return _Frozen; } - - // Set half tone mode for the display of frozen buttons. Default is true. - void setFrozenHalfTone(bool enabled); - bool getFrozenHalfTone() const { return _FrozenHalfTone; } - - // if the radio is a radio button, then all radio button are unselected - void unselect(); - // @} - - - /// \name Colors - // @{ - void setColor(NLMISC::CRGBA col) { _ColorNormal = col; } - void setColorPushed(NLMISC::CRGBA col) { _ColorPushed = col; } - void setColorOver(NLMISC::CRGBA col) { _ColorOver = col; } - - NLMISC::CRGBA getColor() const { return _ColorNormal; } - NLMISC::CRGBA getColorPushed() const { return _ColorPushed; } - NLMISC::CRGBA getColorOver() const { return _ColorOver; } - - // Override because mustupdate 3 states - void setModulateGlobalColorAll(bool state); - void setModulateGlobalColorNormal(bool state) {_ModulateGlobalColorNormal= state;} - void setModulateGlobalColorPushed(bool state) {_ModulateGlobalColorPushed= state;} - void setModulateGlobalColorOver(bool state) {_ModulateGlobalColorOver= state;} - - virtual sint32 getAlpha() const { return _ColorNormal.A; } - virtual void setAlpha (sint32 a) { _ColorOver.A = _ColorNormal.A = _ColorPushed.A = (uint8)a; } - - std::string getColorAsString() const - { return NLMISC::toString(_ColorNormal.R) + " " + NLMISC::toString(_ColorNormal.G) + " " + - NLMISC::toString(_ColorNormal.B) + " " + NLMISC::toString(_ColorNormal.A); } - std::string getColorOverAsString() const - { return NLMISC::toString(_ColorOver.R) + " " + NLMISC::toString(_ColorOver.G) + " " + - NLMISC::toString(_ColorOver.B) + " " + NLMISC::toString(_ColorOver.A); } - std::string getColorPushedAsString() const - { return NLMISC::toString(_ColorPushed.R) + " " + NLMISC::toString(_ColorPushed.G) + " " + - NLMISC::toString(_ColorPushed.B) + " " + NLMISC::toString(_ColorPushed.A); } - - void setColorAsString(const std::string &col) { _ColorNormal = convertColor (col.c_str()); } - void setColorOverAsString(const std::string &col) { _ColorOver = convertColor (col.c_str()); } - void setColorPushedAsString(const std::string &col) { _ColorPushed = convertColor (col.c_str()); } - // @} - - ///\name radio button specific - //@{ - /** Initialize radio button reference - * Advanced: - * NB: must call initRBRef() for radio button if button is created without parse(). - * NB: setParent() must be called before (else assert) + // *************************************************************************** + /** + * Base Class For Buttons. + * \author Lionel Berenguier + * \author Nevrax France + * \date 2003 */ - void initRBRef(); - //@} - void initRBRefFromRadioButton(CCtrlBaseButton * pBut); - - - /// \name Handlers - // @{ - // Event part - void setActionOnLeftClick (const std::string &actionHandlerName) { _AHOnLeftClickString = actionHandlerName; _AHOnLeftClick = CAHManager::getInstance()->getAH(actionHandlerName, _AHLeftClickParams); } - void setActionOnLeftClickParams(const std::string ¶ms) { _AHOnLeftClickStringParams = params; } - void setActionOnRightClick (const std::string &actionHandlerName) { _AHOnRightClick = CAHManager::getInstance()->getAH(actionHandlerName, _AHRightClickParams); } - void setActionOnClockTick (const std::string &ahName) { _AHOnClockTick = CAHManager::getInstance()->getAH(ahName, _AHClockTickParams); } - void setParamsOnLeftClick (const std::string ¶msHandlerName) { _AHLeftClickParams = paramsHandlerName; } - void setParamsOnRightClick (const std::string ¶msHandlerName) { _AHRightClickParams = paramsHandlerName; } - void setParamsOnClockTick (const std::string &ahParamsName) { _AHClockTickParams = ahParamsName; } - - // get Event part - std::string _getActionOnLeftClick() const { return CAHManager::getInstance()->getAHName(_AHOnLeftClick); } - IActionHandler *getActionOnLeftClick () const { return _AHOnLeftClick; } - IActionHandler *getActionOnRightClick () const { return _AHOnRightClick; } - IActionHandler *getActionOnClockTick () const { return _AHOnClockTick; } - std::string _getParamsOnLeftClick () const { return _AHLeftClickParams.toString(); } - const std::string &getParamsOnLeftClick () const { return _AHLeftClickParams; } - const std::string &getParamsOnRightClick () const { return _AHRightClickParams; } - const std::string &getParamsOnClockTick () const { return _AHClockTickParams; } - - // run action on left click - void runLeftClickAction(); - - // Context menu accessor/ One for each button - void setListMenuLeft (const std::string &cm) { _ListMenuLeft = cm; } - void setListMenuRight (const std::string &cm) { _ListMenuRight = cm; } - void setListMenuBoth (const std::string &cm) { _ListMenuLeft= _ListMenuRight= cm; } - std::string getListMenuLeft () { return _ListMenuLeft.toString(); } - std::string getListMenuRight () { return _ListMenuRight.toString(); } - // @} - - - - int luaRunLeftClickAction(CLuaState &ls); - REFLECT_EXPORT_START(CCtrlBaseButton, CCtrlBase) - REFLECT_BOOL("pushed", getPushed, setPushed); - REFLECT_STRING("col_normal", getColorAsString, setColorAsString); - REFLECT_STRING("col_over", getColorOverAsString, setColorOverAsString); - REFLECT_STRING("col_pushed", getColorPushedAsString, setColorPushedAsString); - REFLECT_RGBA("col_normal_rgba", getColor, setColor); - REFLECT_RGBA("col_over_rgba", getColorOver, setColorOver); - REFLECT_RGBA("col_pushed_rgba", getColorPushed, setColorPushed); - REFLECT_BOOL("frozen", getFrozen, setFrozen); - REFLECT_BOOL("frozen_half_tone", getFrozenHalfTone, setFrozenHalfTone); - REFLECT_STRING("onclick_l", _getActionOnLeftClick, setActionOnLeftClick); - REFLECT_STRING("params_l", _getParamsOnLeftClick, setParamsOnLeftClick); - REFLECT_LUA_METHOD("runLeftClickAction", luaRunLeftClickAction); - REFLECT_EXPORT_END - -protected: - EType _Type; - - // State - bool _Pushed : 1; - bool _Over : 1; - bool _OverWhenPushed : 1; - bool _Frozen : 1; - bool _FrozenHalfTone : 1; - bool _ClickWhenPushed : 1; - bool _ModulateGlobalColorNormal : 1; - bool _ModulateGlobalColorPushed : 1; - bool _ModulateGlobalColorOver : 1; - bool _LeftLongClickHandled : 1; // Is it already handled ? - bool _LeftDblClickHandled : 1; - - - ///\name radio button specific - //@{ - CCtrlBaseButton *_RBRefBut; // The reference button. If NULL the control do not own the reference - // There is only one radio button per group that own the reference (the first one) - CCtrlBaseButton **_RBRef; // The pointer onto the reference button - //@} - - - // Colors - NLMISC::CRGBA _ColorNormal; - NLMISC::CRGBA _ColorPushed; - NLMISC::CRGBA _ColorOver; - - ///\name Long click specific - //@{ - sint64 _LeftLongClickDate; // Time we left click down - //@} - - // for double click : last date at which last left click occurred - static sint64 _LastLeftClickDate; - static NLMISC::CRefPtr _LastLeftClickButton; - - ///\name Action Handler - //@{ - IActionHandler *_AHOnOver; - CStringShared _AHOverParams; - std::string _AHOnLeftClickString; - std::string _AHOnLeftClickStringParams; - IActionHandler *_AHOnLeftClick; - CStringShared _AHLeftClickParams; - IActionHandler *_AHOnLeftDblClick; - CStringShared _AHLeftDblClickParams; - IActionHandler *_AHOnRightClick; - CStringShared _AHRightClickParams; - IActionHandler *_AHOnClockTick; - CStringShared _AHClockTickParams; - IActionHandler *_AHOnLeftLongClick; - CStringShared _AHLeftLongClickParams; - //@} - CStringShared _ListMenuLeft; - CStringShared _ListMenuRight; - - // get the colors modulated on request - NLMISC::CRGBA getCurrentColorNormal(NLMISC::CRGBA globalColor) const - { - NLMISC::CRGBA rgba = _ColorNormal; - if(_ModulateGlobalColorNormal) - rgba.modulateFromColor(rgba, globalColor); - return rgba; - } - NLMISC::CRGBA getCurrentColorPushed(NLMISC::CRGBA globalColor) const + class CCtrlBaseButton : public CCtrlBase { - NLMISC::CRGBA rgba = _ColorPushed; - if(_ModulateGlobalColorPushed) - rgba.modulateFromColor(rgba, globalColor); - return rgba; - } - NLMISC::CRGBA getCurrentColorOver(NLMISC::CRGBA globalColor) const - { - NLMISC::CRGBA rgba = _ColorOver; - if(_ModulateGlobalColorOver) - rgba.modulateFromColor(rgba, globalColor); - return rgba; - } - - // call it at draw - void updateOver(bool &lastOver); - virtual void elementCaptured(CCtrlBase *capturedElement); -}; + public: + enum EType { PushButton = 0, ToggleButton, RadioButton, ButtonTypeCount }; + + /// Constructor + CCtrlBaseButton(const TCtorParam ¶m); + + virtual bool parse (xmlNodePtr cur,CInterfaceGroup * parentGroup); + virtual bool handleEvent (const NLGUI::CEventDescriptor& event); + + /// \name Misc + // @{ + void setType (EType t) { _Type = t; } + EType getType() { return _Type; } + + void setClickWhenPushed(bool click) { _ClickWhenPushed = click; } + bool getClickWhenPushed() const { return _ClickWhenPushed; } + + void setPushed (bool state); + bool getPushed () const { return _Pushed; } + + void setFrozen (bool state); + bool getFrozen () const { return _Frozen; } + + // Set half tone mode for the display of frozen buttons. Default is true. + void setFrozenHalfTone(bool enabled); + bool getFrozenHalfTone() const { return _FrozenHalfTone; } + + // if the radio is a radio button, then all radio button are unselected + void unselect(); + // @} + + + /// \name Colors + // @{ + void setColor(NLMISC::CRGBA col) { _ColorNormal = col; } + void setColorPushed(NLMISC::CRGBA col) { _ColorPushed = col; } + void setColorOver(NLMISC::CRGBA col) { _ColorOver = col; } + + NLMISC::CRGBA getColor() const { return _ColorNormal; } + NLMISC::CRGBA getColorPushed() const { return _ColorPushed; } + NLMISC::CRGBA getColorOver() const { return _ColorOver; } + + // Override because mustupdate 3 states + void setModulateGlobalColorAll(bool state); + void setModulateGlobalColorNormal(bool state) {_ModulateGlobalColorNormal= state;} + void setModulateGlobalColorPushed(bool state) {_ModulateGlobalColorPushed= state;} + void setModulateGlobalColorOver(bool state) {_ModulateGlobalColorOver= state;} + + virtual sint32 getAlpha() const { return _ColorNormal.A; } + virtual void setAlpha (sint32 a) { _ColorOver.A = _ColorNormal.A = _ColorPushed.A = (uint8)a; } + + std::string getColorAsString() const + { return NLMISC::toString(_ColorNormal.R) + " " + NLMISC::toString(_ColorNormal.G) + " " + + NLMISC::toString(_ColorNormal.B) + " " + NLMISC::toString(_ColorNormal.A); } + std::string getColorOverAsString() const + { return NLMISC::toString(_ColorOver.R) + " " + NLMISC::toString(_ColorOver.G) + " " + + NLMISC::toString(_ColorOver.B) + " " + NLMISC::toString(_ColorOver.A); } + std::string getColorPushedAsString() const + { return NLMISC::toString(_ColorPushed.R) + " " + NLMISC::toString(_ColorPushed.G) + " " + + NLMISC::toString(_ColorPushed.B) + " " + NLMISC::toString(_ColorPushed.A); } + + void setColorAsString(const std::string &col) { _ColorNormal = convertColor (col.c_str()); } + void setColorOverAsString(const std::string &col) { _ColorOver = convertColor (col.c_str()); } + void setColorPushedAsString(const std::string &col) { _ColorPushed = convertColor (col.c_str()); } + // @} + + ///\name radio button specific + //@{ + /** Initialize radio button reference + * Advanced: + * NB: must call initRBRef() for radio button if button is created without parse(). + * NB: setParent() must be called before (else assert) + */ + void initRBRef(); + //@} + void initRBRefFromRadioButton(CCtrlBaseButton * pBut); + + + /// \name Handlers + // @{ + // Event part + void setActionOnLeftClick (const std::string &actionHandlerName) { _AHOnLeftClickString = actionHandlerName; _AHOnLeftClick = CAHManager::getInstance()->getAH(actionHandlerName, _AHLeftClickParams); } + void setActionOnLeftClickParams(const std::string ¶ms) { _AHOnLeftClickStringParams = params; } + void setActionOnRightClick (const std::string &actionHandlerName) { _AHOnRightClick = CAHManager::getInstance()->getAH(actionHandlerName, _AHRightClickParams); } + void setActionOnClockTick (const std::string &ahName) { _AHOnClockTick = CAHManager::getInstance()->getAH(ahName, _AHClockTickParams); } + void setParamsOnLeftClick (const std::string ¶msHandlerName) { _AHLeftClickParams = paramsHandlerName; } + void setParamsOnRightClick (const std::string ¶msHandlerName) { _AHRightClickParams = paramsHandlerName; } + void setParamsOnClockTick (const std::string &ahParamsName) { _AHClockTickParams = ahParamsName; } + + // get Event part + std::string _getActionOnLeftClick() const { return CAHManager::getInstance()->getAHName(_AHOnLeftClick); } + IActionHandler *getActionOnLeftClick () const { return _AHOnLeftClick; } + IActionHandler *getActionOnRightClick () const { return _AHOnRightClick; } + IActionHandler *getActionOnClockTick () const { return _AHOnClockTick; } + std::string _getParamsOnLeftClick () const { return _AHLeftClickParams.toString(); } + const std::string &getParamsOnLeftClick () const { return _AHLeftClickParams; } + const std::string &getParamsOnRightClick () const { return _AHRightClickParams; } + const std::string &getParamsOnClockTick () const { return _AHClockTickParams; } + + // run action on left click + void runLeftClickAction(); + + // Context menu accessor/ One for each button + void setListMenuLeft (const std::string &cm) { _ListMenuLeft = cm; } + void setListMenuRight (const std::string &cm) { _ListMenuRight = cm; } + void setListMenuBoth (const std::string &cm) { _ListMenuLeft= _ListMenuRight= cm; } + std::string getListMenuLeft () { return _ListMenuLeft.toString(); } + std::string getListMenuRight () { return _ListMenuRight.toString(); } + // @} + + + + int luaRunLeftClickAction(CLuaState &ls); + REFLECT_EXPORT_START(CCtrlBaseButton, CCtrlBase) + REFLECT_BOOL("pushed", getPushed, setPushed); + REFLECT_STRING("col_normal", getColorAsString, setColorAsString); + REFLECT_STRING("col_over", getColorOverAsString, setColorOverAsString); + REFLECT_STRING("col_pushed", getColorPushedAsString, setColorPushedAsString); + REFLECT_RGBA("col_normal_rgba", getColor, setColor); + REFLECT_RGBA("col_over_rgba", getColorOver, setColorOver); + REFLECT_RGBA("col_pushed_rgba", getColorPushed, setColorPushed); + REFLECT_BOOL("frozen", getFrozen, setFrozen); + REFLECT_BOOL("frozen_half_tone", getFrozenHalfTone, setFrozenHalfTone); + REFLECT_STRING("onclick_l", _getActionOnLeftClick, setActionOnLeftClick); + REFLECT_STRING("params_l", _getParamsOnLeftClick, setParamsOnLeftClick); + REFLECT_LUA_METHOD("runLeftClickAction", luaRunLeftClickAction); + REFLECT_EXPORT_END + + protected: + EType _Type; + + // State + bool _Pushed : 1; + bool _Over : 1; + bool _OverWhenPushed : 1; + bool _Frozen : 1; + bool _FrozenHalfTone : 1; + bool _ClickWhenPushed : 1; + bool _ModulateGlobalColorNormal : 1; + bool _ModulateGlobalColorPushed : 1; + bool _ModulateGlobalColorOver : 1; + bool _LeftLongClickHandled : 1; // Is it already handled ? + bool _LeftDblClickHandled : 1; + + + ///\name radio button specific + //@{ + CCtrlBaseButton *_RBRefBut; // The reference button. If NULL the control do not own the reference + // There is only one radio button per group that own the reference (the first one) + CCtrlBaseButton **_RBRef; // The pointer onto the reference button + //@} + + + // Colors + NLMISC::CRGBA _ColorNormal; + NLMISC::CRGBA _ColorPushed; + NLMISC::CRGBA _ColorOver; + + ///\name Long click specific + //@{ + sint64 _LeftLongClickDate; // Time we left click down + //@} + + // for double click : last date at which last left click occurred + static sint64 _LastLeftClickDate; + static NLMISC::CRefPtr _LastLeftClickButton; + + ///\name Action Handler + //@{ + IActionHandler *_AHOnOver; + CStringShared _AHOverParams; + std::string _AHOnLeftClickString; + std::string _AHOnLeftClickStringParams; + IActionHandler *_AHOnLeftClick; + CStringShared _AHLeftClickParams; + IActionHandler *_AHOnLeftDblClick; + CStringShared _AHLeftDblClickParams; + IActionHandler *_AHOnRightClick; + CStringShared _AHRightClickParams; + IActionHandler *_AHOnClockTick; + CStringShared _AHClockTickParams; + IActionHandler *_AHOnLeftLongClick; + CStringShared _AHLeftLongClickParams; + //@} + CStringShared _ListMenuLeft; + CStringShared _ListMenuRight; + + // get the colors modulated on request + NLMISC::CRGBA getCurrentColorNormal(NLMISC::CRGBA globalColor) const + { + NLMISC::CRGBA rgba = _ColorNormal; + if(_ModulateGlobalColorNormal) + rgba.modulateFromColor(rgba, globalColor); + return rgba; + } + NLMISC::CRGBA getCurrentColorPushed(NLMISC::CRGBA globalColor) const + { + NLMISC::CRGBA rgba = _ColorPushed; + if(_ModulateGlobalColorPushed) + rgba.modulateFromColor(rgba, globalColor); + return rgba; + } + NLMISC::CRGBA getCurrentColorOver(NLMISC::CRGBA globalColor) const + { + NLMISC::CRGBA rgba = _ColorOver; + if(_ModulateGlobalColorOver) + rgba.modulateFromColor(rgba, globalColor); + return rgba; + } + + // call it at draw + void updateOver(bool &lastOver); + virtual void elementCaptured(CCtrlBase *capturedElement); + }; + +} #endif // NL_CTRL_BASE_BUTTON_H diff --git a/code/nel/src/gui/ctrl_base_button.cpp b/code/nel/src/gui/ctrl_base_button.cpp index 39e6f0d14..2d1a61f9b 100644 --- a/code/nel/src/gui/ctrl_base_button.cpp +++ b/code/nel/src/gui/ctrl_base_button.cpp @@ -26,490 +26,495 @@ using namespace std; using namespace NLMISC; - -// *************************************************************************** -static const uint KEY_REPEAT_MIN = 100; -static const uint KEY_REPEAT_MAX = 750; - - -sint64 CCtrlBaseButton::_LastLeftClickDate = 0; -NLMISC::CRefPtr CCtrlBaseButton::_LastLeftClickButton; - - -// *************************************************************************** -CCtrlBaseButton::CCtrlBaseButton(const TCtorParam ¶m) : CCtrlBase(param), _Type(ToggleButton) +namespace { - _Pushed = _Over = false; - _Frozen = false; - _FrozenHalfTone = true; - _OverWhenPushed = true; - _ColorOver = _ColorPushed = _ColorNormal = NLMISC::CRGBA(255,255,255,255); - _ModulateGlobalColorNormal= _ModulateGlobalColorPushed= _ModulateGlobalColorOver= true; - _LeftLongClickHandled = true; - _LeftDblClickHandled = false; - _ClickWhenPushed = false; - _RBRefBut = NULL; - _RBRef = NULL; - - _AHOnOver = NULL; - _AHOnLeftClick = NULL; - _AHOnRightClick = NULL; - _AHOnClockTick = NULL; - _AHOnLeftLongClick = NULL; - _AHOnLeftDblClick = NULL; + const uint KEY_REPEAT_MIN = 100; + const uint KEY_REPEAT_MAX = 750; } - - -// *************************************************************************** -bool CCtrlBaseButton::parse (xmlNodePtr cur,CInterfaceGroup * parentGroup) +namespace NLGUI { - CXMLAutoPtr prop; - //try to get props that can be inherited from groups - //if a property is not defined, try to find it in the parent group. - //if it is undefined, set it to zero - if (! CCtrlBase::parse(cur,parentGroup) ) - return false; + sint64 CCtrlBaseButton::_LastLeftClickDate = 0; + NLMISC::CRefPtr CCtrlBaseButton::_LastLeftClickButton; - _Over = false; - // *** try to get the NEEDED specific props - prop = xmlGetProp (cur, (xmlChar*)"button_type"); - string type; - if (prop) type = (const char*) prop; - if (type.empty() || type == "toggle_button") + // *************************************************************************** + CCtrlBaseButton::CCtrlBaseButton(const TCtorParam ¶m) : CCtrlBase(param), _Type(ToggleButton) { - _Type = ToggleButton; + _Pushed = _Over = false; + _Frozen = false; + _FrozenHalfTone = true; + _OverWhenPushed = true; + _ColorOver = _ColorPushed = _ColorNormal = NLMISC::CRGBA(255,255,255,255); + _ModulateGlobalColorNormal= _ModulateGlobalColorPushed= _ModulateGlobalColorOver= true; + _LeftLongClickHandled = true; + _LeftDblClickHandled = false; + _ClickWhenPushed = false; + _RBRefBut = NULL; + _RBRef = NULL; + + _AHOnOver = NULL; + _AHOnLeftClick = NULL; + _AHOnRightClick = NULL; + _AHOnClockTick = NULL; + _AHOnLeftLongClick = NULL; + _AHOnLeftDblClick = NULL; } - else if (type == "push_button") - { - _Type = PushButton; - } - else if (type == "radio_button") - { - _Type = RadioButton; - initRBRef(); - if (_Pushed) - *_RBRef = this; - } - else - { - nlinfo(("cannot parse button type for button " + getId()).c_str()); - } - prop= (char*) xmlGetProp (cur, (xmlChar*)"pushed"); - _Pushed = false; - if (prop) - _Pushed = convertBool(prop); - - prop= (char*) xmlGetProp (cur, (xmlChar*)"over_when_pushed"); - _OverWhenPushed = true; - if (prop) - _OverWhenPushed = convertBool(prop); - - prop= (char*) xmlGetProp (cur, (xmlChar*)"click_when_pushed"); - _ClickWhenPushed = false; - if (prop) - _ClickWhenPushed = convertBool(prop); - - // *** Read Colors - // get color normal - prop= (char*) xmlGetProp( cur, (xmlChar*)"color" ); - _ColorNormal = CRGBA(255,255,255,255); - if (prop) - _ColorNormal = convertColor (prop); - - // Get ColorPushed - prop= (char*) xmlGetProp( cur, (xmlChar*)"col_pushed" ); - _ColorPushed = CRGBA(255,255,255,255); - if (prop) - _ColorPushed = convertColor(prop); - - // Get ColorOver - prop= (char*) xmlGetProp( cur, (xmlChar*)"col_over" ); - _ColorOver = CRGBA(255,255,255,255); - if (prop) - _ColorOver = convertColor(prop); - - // Default: take "global_color" param interface_element option. - _ModulateGlobalColorNormal= _ModulateGlobalColorPushed= _ModulateGlobalColorOver= getModulateGlobalColor(); - - // Read special global_color for each state - prop = (char*) xmlGetProp( cur, (xmlChar*)"global_color_normal" ); - if (prop) _ModulateGlobalColorNormal= convertBool(prop); - prop = (char*) xmlGetProp( cur, (xmlChar*)"global_color_pushed" ); - if (prop) _ModulateGlobalColorPushed= convertBool(prop); - prop = (char*) xmlGetProp( cur, (xmlChar*)"global_color_over" ); - if (prop) _ModulateGlobalColorOver= convertBool(prop); - - - // *** Read Action handlers - CAHManager::getInstance()->parseAH(cur, "onover", "params_over", _AHOnOver, _AHOverParams); - CAHManager::getInstance()->parseAH(cur, "onclick_l", "params_l", _AHOnLeftClick, _AHLeftClickParams); - CAHManager::getInstance()->parseAH(cur, "ondblclick_l", "params_dblclick_l", _AHOnLeftDblClick, _AHLeftDblClickParams); - CAHManager::getInstance()->parseAH(cur, "onclick_r", "params_r", _AHOnRightClick, _AHRightClickParams); - CAHManager::getInstance()->parseAH(cur, "onlongclick_l", "params_longclick_l", _AHOnLeftLongClick, _AHLeftLongClickParams); - CAHManager::getInstance()->parseAH(cur, "onclock_tick", "params_clock_tick", _AHOnClockTick, _AHClockTickParams); - - // Context menu association - prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_l" ); - if (prop) - { - _ListMenuLeft = NLMISC::toLower(std::string((const char *) prop)); - } - prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_r" ); - if (prop) - { - _ListMenuRight = NLMISC::toLower(std::string((const char *) prop)); - } - // list menu on both clicks - prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_b" ); - if (prop) + + // *************************************************************************** + bool CCtrlBaseButton::parse (xmlNodePtr cur,CInterfaceGroup * parentGroup) { - setListMenuBoth(NLMISC::toLower(std::string((const char *) prop))); - } + CXMLAutoPtr prop; + + //try to get props that can be inherited from groups + //if a property is not defined, try to find it in the parent group. + //if it is undefined, set it to zero + if (! CCtrlBase::parse(cur,parentGroup) ) + return false; - prop= (char*) xmlGetProp (cur, (xmlChar*)"frozen"); - _Frozen = false; - if (prop) - _Frozen = convertBool(prop); + _Over = false; - prop= (char*) xmlGetProp (cur, (xmlChar*)"frozen_half_tone"); - _FrozenHalfTone = true; - if (prop) - _FrozenHalfTone = convertBool(prop); + // *** try to get the NEEDED specific props + prop = xmlGetProp (cur, (xmlChar*)"button_type"); + string type; + if (prop) type = (const char*) prop; + if (type.empty() || type == "toggle_button") + { + _Type = ToggleButton; + } + else if (type == "push_button") + { + _Type = PushButton; + } + else if (type == "radio_button") + { + _Type = RadioButton; - return true; -} + initRBRef(); + if (_Pushed) + *_RBRef = this; + } + else + { + nlinfo(("cannot parse button type for button " + getId()).c_str()); + } + prop= (char*) xmlGetProp (cur, (xmlChar*)"pushed"); + _Pushed = false; + if (prop) + _Pushed = convertBool(prop); + + prop= (char*) xmlGetProp (cur, (xmlChar*)"over_when_pushed"); + _OverWhenPushed = true; + if (prop) + _OverWhenPushed = convertBool(prop); + + prop= (char*) xmlGetProp (cur, (xmlChar*)"click_when_pushed"); + _ClickWhenPushed = false; + if (prop) + _ClickWhenPushed = convertBool(prop); + + // *** Read Colors + // get color normal + prop= (char*) xmlGetProp( cur, (xmlChar*)"color" ); + _ColorNormal = CRGBA(255,255,255,255); + if (prop) + _ColorNormal = convertColor (prop); + + // Get ColorPushed + prop= (char*) xmlGetProp( cur, (xmlChar*)"col_pushed" ); + _ColorPushed = CRGBA(255,255,255,255); + if (prop) + _ColorPushed = convertColor(prop); + + // Get ColorOver + prop= (char*) xmlGetProp( cur, (xmlChar*)"col_over" ); + _ColorOver = CRGBA(255,255,255,255); + if (prop) + _ColorOver = convertColor(prop); + + // Default: take "global_color" param interface_element option. + _ModulateGlobalColorNormal= _ModulateGlobalColorPushed= _ModulateGlobalColorOver= getModulateGlobalColor(); + + // Read special global_color for each state + prop = (char*) xmlGetProp( cur, (xmlChar*)"global_color_normal" ); + if (prop) _ModulateGlobalColorNormal= convertBool(prop); + prop = (char*) xmlGetProp( cur, (xmlChar*)"global_color_pushed" ); + if (prop) _ModulateGlobalColorPushed= convertBool(prop); + prop = (char*) xmlGetProp( cur, (xmlChar*)"global_color_over" ); + if (prop) _ModulateGlobalColorOver= convertBool(prop); + + + // *** Read Action handlers + CAHManager::getInstance()->parseAH(cur, "onover", "params_over", _AHOnOver, _AHOverParams); + CAHManager::getInstance()->parseAH(cur, "onclick_l", "params_l", _AHOnLeftClick, _AHLeftClickParams); + CAHManager::getInstance()->parseAH(cur, "ondblclick_l", "params_dblclick_l", _AHOnLeftDblClick, _AHLeftDblClickParams); + CAHManager::getInstance()->parseAH(cur, "onclick_r", "params_r", _AHOnRightClick, _AHRightClickParams); + CAHManager::getInstance()->parseAH(cur, "onlongclick_l", "params_longclick_l", _AHOnLeftLongClick, _AHLeftLongClickParams); + CAHManager::getInstance()->parseAH(cur, "onclock_tick", "params_clock_tick", _AHOnClockTick, _AHClockTickParams); + + // Context menu association + prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_l" ); + if (prop) + { + _ListMenuLeft = NLMISC::toLower(std::string((const char *) prop)); + } + prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_r" ); + if (prop) + { + _ListMenuRight = NLMISC::toLower(std::string((const char *) prop)); + } + // list menu on both clicks + prop = (char*) xmlGetProp( cur, (xmlChar*)"menu_b" ); + if (prop) + { + setListMenuBoth(NLMISC::toLower(std::string((const char *) prop))); + } -// *************************************************************************** -void CCtrlBaseButton::setModulateGlobalColorAll(bool state) -{ - setModulateGlobalColor(state); - setModulateGlobalColorNormal(state); - setModulateGlobalColorPushed(state); - setModulateGlobalColorOver(state); -} + prop= (char*) xmlGetProp (cur, (xmlChar*)"frozen"); + _Frozen = false; + if (prop) + _Frozen = convertBool(prop); + prop= (char*) xmlGetProp (cur, (xmlChar*)"frozen_half_tone"); + _FrozenHalfTone = true; + if (prop) + _FrozenHalfTone = convertBool(prop); -// *************************************************************************** -bool CCtrlBaseButton::handleEvent (const NLGUI::CEventDescriptor& event) -{ - if (CCtrlBase::handleEvent(event)) return true; - if (!_Active || _Frozen) - return false; + return true; + } - sint64 T1 = NLMISC::CTime::getLocalTime(); - if (event.getType() == NLGUI::CEventDescriptor::mouse) + // *************************************************************************** + void CCtrlBaseButton::setModulateGlobalColorAll(bool state) { - const NLGUI::CEventDescriptorMouse &eventDesc = (const NLGUI::CEventDescriptorMouse &)event; + setModulateGlobalColor(state); + setModulateGlobalColorNormal(state); + setModulateGlobalColorPushed(state); + setModulateGlobalColorOver(state); + } - if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup) - { - if (CWidgetManager::getInstance()->getCapturePointerLeft() != this) - return false; - _LeftLongClickHandled = true; - } - if (!((eventDesc.getX() >= _XReal) && - (eventDesc.getX() < (_XReal + _WReal))&& - (eventDesc.getY() > _YReal) && - (eventDesc.getY() <= (_YReal+ _HReal)))) + // *************************************************************************** + bool CCtrlBaseButton::handleEvent (const NLGUI::CEventDescriptor& event) + { + if (CCtrlBase::handleEvent(event)) return true; + if (!_Active || _Frozen) return false; - if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftdown) + sint64 T1 = NLMISC::CTime::getLocalTime(); + + if (event.getType() == NLGUI::CEventDescriptor::mouse) { - if (_AHOnLeftDblClick) - { - if ((CCtrlBaseButton *) _LastLeftClickButton == this && (T1 - _LastLeftClickDate) < CWidgetManager::getInstance()->getUserDblClickDelay()) - { - CAHManager::getInstance()->runActionHandler (_AHOnLeftDblClick, this, _AHLeftDblClickParams); - _LeftDblClickHandled = true; - _LastLeftClickButton = NULL; - return true; - } - } + const NLGUI::CEventDescriptorMouse &eventDesc = (const NLGUI::CEventDescriptorMouse &)event; - if (_AHOnLeftLongClick != NULL) + if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup) { - _LeftLongClickHandled = false; - _LeftLongClickDate = T1; + if (CWidgetManager::getInstance()->getCapturePointerLeft() != this) + return false; + _LeftLongClickHandled = true; } - _LeftDblClickHandled = false; - _LastLeftClickButton = NULL; - return true; - } - if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup) - { - if (CWidgetManager::getInstance()->getCapturePointerLeft() != this) + if (!((eventDesc.getX() >= _XReal) && + (eventDesc.getX() < (_XReal + _WReal))&& + (eventDesc.getY() > _YReal) && + (eventDesc.getY() <= (_YReal+ _HReal)))) return false; - if (_LeftDblClickHandled) // no effect on mouse up after double click has been handled + if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftdown) { + if (_AHOnLeftDblClick) + { + if ((CCtrlBaseButton *) _LastLeftClickButton == this && (T1 - _LastLeftClickDate) < CWidgetManager::getInstance()->getUserDblClickDelay()) + { + CAHManager::getInstance()->runActionHandler (_AHOnLeftDblClick, this, _AHLeftDblClickParams); + _LeftDblClickHandled = true; + _LastLeftClickButton = NULL; + return true; + } + } + + if (_AHOnLeftLongClick != NULL) + { + _LeftLongClickHandled = false; + _LeftLongClickDate = T1; + } _LeftDblClickHandled = false; + _LastLeftClickButton = NULL; return true; } - // Do not launch 2 times action handler if we are already pushed ! except if we want. - if (!_ClickWhenPushed) + if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouseleftup) { - if ((_Type == RadioButton) && _RBRef && (*_RBRef == this)) + if (CWidgetManager::getInstance()->getCapturePointerLeft() != this) + return false; + + if (_LeftDblClickHandled) // no effect on mouse up after double click has been handled + { + _LeftDblClickHandled = false; return true; - } + } - if (_Type == RadioButton) - { - _Pushed = true; - if(_RBRef) *_RBRef = this; - } + // Do not launch 2 times action handler if we are already pushed ! except if we want. + if (!_ClickWhenPushed) + { + if ((_Type == RadioButton) && _RBRef && (*_RBRef == this)) + return true; + } - if (_Type == ToggleButton) - _Pushed = !_Pushed; + if (_Type == RadioButton) + { + _Pushed = true; + if(_RBRef) *_RBRef = this; + } - /* - // RunAction - if(_AHOnLeftClick != NULL) - { - //nlinfo("clicked on %s", _Id.c_str()); - pIM->submitEvent ("button_click:"+getId());//TEMP - CAHManager::getInstance()->runActionHandler (_AHOnLeftClick, this, _AHLeftClickParams); - //pIM->submitEvent ("button_click:"+getId()); - } - */ - runLeftClickAction(); - if (CWidgetManager::getInstance()->getCapturePointerLeft() == NULL) return true; // event handler may release cpature from this object (if it is removed for example) + if (_Type == ToggleButton) + _Pushed = !_Pushed; - // Run Menu - if (!_ListMenuLeft.empty()) - CWidgetManager::getInstance()->enableModalWindow (this, _ListMenuLeft); + /* + // RunAction + if(_AHOnLeftClick != NULL) + { + //nlinfo("clicked on %s", _Id.c_str()); + pIM->submitEvent ("button_click:"+getId());//TEMP + CAHManager::getInstance()->runActionHandler (_AHOnLeftClick, this, _AHLeftClickParams); + //pIM->submitEvent ("button_click:"+getId()); + } + */ + runLeftClickAction(); + if (CWidgetManager::getInstance()->getCapturePointerLeft() == NULL) return true; // event handler may release cpature from this object (if it is removed for example) - if (_AHOnLeftDblClick != NULL) - { - _LastLeftClickDate = T1; - _LastLeftClickButton = this; - } + // Run Menu + if (!_ListMenuLeft.empty()) + CWidgetManager::getInstance()->enableModalWindow (this, _ListMenuLeft); - // Always return true on LeftClick. - return true; - } - if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightdown) - { - _LastLeftClickButton = NULL; - return true; - } - if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightup) - { - _LastLeftClickButton = NULL; - bool handled= false; - if (CWidgetManager::getInstance()->getCapturePointerRight() != this) - return false; + if (_AHOnLeftDblClick != NULL) + { + _LastLeftClickDate = T1; + _LastLeftClickButton = this; + } - // RunAction - if(_AHOnRightClick != NULL) + // Always return true on LeftClick. + return true; + } + if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightdown) { - handled= true; - CAHManager::getInstance()->runActionHandler (_AHOnRightClick, this, _AHRightClickParams); + _LastLeftClickButton = NULL; + return true; } - if (CWidgetManager::getInstance()->getCapturePointerRight() == NULL) return true; // if this become NULL, this ctrl has been deleted - // Run Menu - if (!_ListMenuRight .empty()) + if (eventDesc.getEventTypeExtended() == NLGUI::CEventDescriptorMouse::mouserightup) { - handled= true; - CWidgetManager::getInstance()->enableModalWindow (this, _ListMenuRight); + _LastLeftClickButton = NULL; + bool handled= false; + if (CWidgetManager::getInstance()->getCapturePointerRight() != this) + return false; + + // RunAction + if(_AHOnRightClick != NULL) + { + handled= true; + CAHManager::getInstance()->runActionHandler (_AHOnRightClick, this, _AHRightClickParams); + } + if (CWidgetManager::getInstance()->getCapturePointerRight() == NULL) return true; // if this become NULL, this ctrl has been deleted + // Run Menu + if (!_ListMenuRight .empty()) + { + handled= true; + CWidgetManager::getInstance()->enableModalWindow (this, _ListMenuRight); + } + // If not handled here, ret to parent + return handled; } - // If not handled here, ret to parent - return handled; - } - } - else if (event.getType() == NLGUI::CEventDescriptor::system) - { - const NLGUI::CEventDescriptorSystem &systemEvent = (const NLGUI::CEventDescriptorSystem &) event; - if (systemEvent.getEventTypeExtended() == NLGUI::CEventDescriptorSystem::clocktick) + } + else if (event.getType() == NLGUI::CEventDescriptor::system) { - if (_AHOnClockTick != NULL) + const NLGUI::CEventDescriptorSystem &systemEvent = (const NLGUI::CEventDescriptorSystem &) event; + if (systemEvent.getEventTypeExtended() == NLGUI::CEventDescriptorSystem::clocktick) { - CAHManager::getInstance()->runActionHandler(_AHOnClockTick, this, _AHClockTickParams); - } + if (_AHOnClockTick != NULL) + { + CAHManager::getInstance()->runActionHandler(_AHOnClockTick, this, _AHClockTickParams); + } - if (CWidgetManager::getInstance()->getCapturePointerLeft() == this) - { - if (!_LeftLongClickHandled) + if (CWidgetManager::getInstance()->getCapturePointerLeft() == this) { - uint nVal = 50; - CCDBNodeLeaf *pNL = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:KEY_REPEAT_SPEED"); - if (pNL != NULL) - nVal = pNL->getValue32(); - uint repeatDelay = (uint)(KEY_REPEAT_MIN + (KEY_REPEAT_MAX-KEY_REPEAT_MIN) * (float)nVal / 100.0f); - if ((T1 - _LeftLongClickDate) > repeatDelay) + if (!_LeftLongClickHandled) { - _LeftLongClickHandled = true; - CAHManager::getInstance()->runActionHandler(_AHOnLeftLongClick, this, _AHLeftLongClickParams); + uint nVal = 50; + CCDBNodeLeaf *pNL = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:KEY_REPEAT_SPEED"); + if (pNL != NULL) + nVal = pNL->getValue32(); + uint repeatDelay = (uint)(KEY_REPEAT_MIN + (KEY_REPEAT_MAX-KEY_REPEAT_MIN) * (float)nVal / 100.0f); + if ((T1 - _LeftLongClickDate) > repeatDelay) + { + _LeftLongClickHandled = true; + CAHManager::getInstance()->runActionHandler(_AHOnLeftLongClick, this, _AHLeftLongClickParams); + } } } } } + return false; } - return false; -} -// *************************************************************************** -void CCtrlBaseButton::initRBRef() -{ - if (_RBRef != NULL) return; - nlassert(_Parent); - const vector &vCB = _Parent->getControls(); - uint i = 0; - for (i = 0; i < vCB.size(); ++i) + // *************************************************************************** + void CCtrlBaseButton::initRBRef() { - CCtrlBaseButton *pBut = dynamic_cast(vCB[i]); - if (pBut && pBut->_Type == RadioButton) + if (_RBRef != NULL) return; + nlassert(_Parent); + const vector &vCB = _Parent->getControls(); + uint i = 0; + for (i = 0; i < vCB.size(); ++i) { - _RBRef = &pBut->_RBRefBut; - break; + CCtrlBaseButton *pBut = dynamic_cast(vCB[i]); + if (pBut && pBut->_Type == RadioButton) + { + _RBRef = &pBut->_RBRefBut; + break; + } } + // If we are the first radio button of the group and not added + if (i == vCB.size()) + _RBRef = &this->_RBRefBut; } - // If we are the first radio button of the group and not added - if (i == vCB.size()) - _RBRef = &this->_RBRefBut; -} -// *************************************************************************** -void CCtrlBaseButton::initRBRefFromRadioButton(CCtrlBaseButton * pBut) -{ - if(pBut && pBut->_Type == RadioButton) + // *************************************************************************** + void CCtrlBaseButton::initRBRefFromRadioButton(CCtrlBaseButton * pBut) { - _RBRef = &(pBut->_RBRefBut); - _RBRefBut=NULL; + if(pBut && pBut->_Type == RadioButton) + { + _RBRef = &(pBut->_RBRefBut); + _RBRefBut=NULL; + } } -} -// *************************************************************************** -void CCtrlBaseButton::setPushed (bool state) -{ - _Pushed = state; - - if (_Type == RadioButton && _RBRef) + // *************************************************************************** + void CCtrlBaseButton::setPushed (bool state) { - if (state == true) - { - *_RBRef = this; - } - else + _Pushed = state; + + if (_Type == RadioButton && _RBRef) { - if (*_RBRef == this) // I have to be pushed to unpush me - *_RBRef = NULL; // After that : All radio buttons are NOT pushed + if (state == true) + { + *_RBRef = this; + } + else + { + if (*_RBRef == this) // I have to be pushed to unpush me + *_RBRef = NULL; // After that : All radio buttons are NOT pushed + } } } -} -// *************************************************************************** -void CCtrlBaseButton::setFrozen (bool state) -{ - _Frozen = state; - if (_Frozen) + // *************************************************************************** + void CCtrlBaseButton::setFrozen (bool state) { - _Pushed = false; - _Over = false; + _Frozen = state; + if (_Frozen) + { + _Pushed = false; + _Over = false; + } } -} - -// *************************************************************************** -void CCtrlBaseButton::setFrozenHalfTone(bool enabled) -{ - _FrozenHalfTone = enabled; -} -// *************************************************************************** -void CCtrlBaseButton::unselect() -{ - if (_Type == RadioButton) + // *************************************************************************** + void CCtrlBaseButton::setFrozenHalfTone(bool enabled) { - if (_RBRef) *_RBRef = NULL; + _FrozenHalfTone = enabled; } -} - -// *************************************************************************** -void CCtrlBaseButton::updateOver(bool &lastOver) -{ - if (!CWidgetManager::getInstance()->isMouseHandlingEnabled()) + // *************************************************************************** + void CCtrlBaseButton::unselect() { - _Over = false; - return; + if (_Type == RadioButton) + { + if (_RBRef) *_RBRef = NULL; + } } - if (CWidgetManager::getInstance()->getCapturePointerLeft() != NULL) + + // *************************************************************************** + void CCtrlBaseButton::updateOver(bool &lastOver) { - if (CWidgetManager::getInstance()->getCapturePointerLeft() != this) + if (!CWidgetManager::getInstance()->isMouseHandlingEnabled()) { _Over = false; + return; } - return; - } - const vector &rVB = CWidgetManager::getInstance()->getCtrlsUnderPointer (); + if (CWidgetManager::getInstance()->getCapturePointerLeft() != NULL) + { + if (CWidgetManager::getInstance()->getCapturePointerLeft() != this) + { + _Over = false; + } + return; + } - if (!_Frozen) - { - uint32 i; - lastOver = _Over; - // show over if it is the last control that has the same father - CCtrlBase *candidate = NULL; - for (i = 0; i < rVB.size(); ++i) + const vector &rVB = CWidgetManager::getInstance()->getCtrlsUnderPointer (); + + if (!_Frozen) { - if (rVB[i]->getParent() == this->getParent()) + uint32 i; + lastOver = _Over; + // show over if it is the last control that has the same father + CCtrlBase *candidate = NULL; + for (i = 0; i < rVB.size(); ++i) { - candidate = rVB[i]; + if (rVB[i]->getParent() == this->getParent()) + { + candidate = rVB[i]; + } } + _Over = (candidate == this); } - _Over = (candidate == this); - } - else - _Over = false; + else + _Over = false; -} + } -// *************************************************************************** -void CCtrlBaseButton::elementCaptured(CCtrlBase *capturedElement) -{ - // if not me, then reset my '_Over' - if (capturedElement != this) + // *************************************************************************** + void CCtrlBaseButton::elementCaptured(CCtrlBase *capturedElement) { - _Over = false; + // if not me, then reset my '_Over' + if (capturedElement != this) + { + _Over = false; + } } -} -// *************************************************************************** -void CCtrlBaseButton::runLeftClickAction() -{ - if(_AHOnLeftClick != NULL) + // *************************************************************************** + void CCtrlBaseButton::runLeftClickAction() { + if(_AHOnLeftClick != NULL) + { - //nlinfo("clicked on %s", _Id.c_str()); - CAHManager::getInstance()->submitEvent( "button_click:" + getId() ); - CAHManager::getInstance()->runActionHandler (_AHOnLeftClick, this, _AHLeftClickParams); - //pIM->submitEvent ("button_click:"+getId()); + //nlinfo("clicked on %s", _Id.c_str()); + CAHManager::getInstance()->submitEvent( "button_click:" + getId() ); + CAHManager::getInstance()->runActionHandler (_AHOnLeftClick, this, _AHLeftClickParams); + //pIM->submitEvent ("button_click:"+getId()); + } } -} -// *************************************************************************** -int CCtrlBaseButton::luaRunLeftClickAction(CLuaState &ls) -{ - const char *funcName = "onLeftClick"; - CLuaIHM::checkArgCount(ls, funcName, 0); + // *************************************************************************** + int CCtrlBaseButton::luaRunLeftClickAction(CLuaState &ls) + { + const char *funcName = "onLeftClick"; + CLuaIHM::checkArgCount(ls, funcName, 0); - runLeftClickAction(); + runLeftClickAction(); + + return 0; + } - return 0; } diff --git a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h b/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h index bcbd1e972..75a162dd5 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h @@ -26,9 +26,14 @@ #include "game_share/skills.h" +namespace NLGUI +{ + class CCtrlBaseButton; +} + + // *************************************************************************** class CDBCtrlSheet; -class CCtrlBaseButton; class CSBrickSheet; class CViewBitmap; class CViewText; diff --git a/code/ryzom/client/src/interface_v3/dbgroup_combo_box.h b/code/ryzom/client/src/interface_v3/dbgroup_combo_box.h index 69c1754c0..90e1a2036 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_combo_box.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_combo_box.h @@ -22,11 +22,13 @@ #include "nel/misc/types_nl.h" #include "nel/gui/interface_group.h" - +namespace NLGUI +{ + class CCtrlBaseButton; +} // *************************************************************************** class CViewText; -class CCtrlBaseButton; class CGroupMenu; // *************************************************************************** diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h index 171152cfc..894a34ea8 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h @@ -23,9 +23,12 @@ #include "list_sheet_base.h" #include "dbctrl_sheet.h" +namespace NLGUI +{ + class CCtrlBaseButton; +} // *************************************************************************** -class CCtrlBaseButton; class CCtrlScroll; class CGroupContainer; diff --git a/code/ryzom/client/src/interface_v3/dbgroup_select_number.h b/code/ryzom/client/src/interface_v3/dbgroup_select_number.h index 4a103161b..a02708e87 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_select_number.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_select_number.h @@ -23,11 +23,15 @@ #include "nel/gui/interface_group.h" +namespace NLGUI +{ + class CCtrlBaseButton; +} + // *************************************************************************** class CViewBitmap; class CViewText; -class CCtrlBaseButton; // *************************************************************************** diff --git a/code/ryzom/client/src/interface_v3/group_scrolltext.h b/code/ryzom/client/src/interface_v3/group_scrolltext.h index 520a416af..e0b11b91d 100644 --- a/code/ryzom/client/src/interface_v3/group_scrolltext.h +++ b/code/ryzom/client/src/interface_v3/group_scrolltext.h @@ -23,9 +23,13 @@ #include "nel/misc/types_nl.h" #include "nel/gui/interface_group.h" +namespace NLGUI +{ + class CCtrlBaseButton; +} + class CGroupList; class CCtrlScroll; -class CCtrlBaseButton; // Can be used to build a chat window or anything that displays sequences of strings /** diff --git a/code/ryzom/client/src/interface_v3/interface_pointer.h b/code/ryzom/client/src/interface_v3/interface_pointer.h index 817c927ae..e0e193baa 100644 --- a/code/ryzom/client/src/interface_v3/interface_pointer.h +++ b/code/ryzom/client/src/interface_v3/interface_pointer.h @@ -25,6 +25,7 @@ namespace NLGUI { class CInterfaceElement; class CCtrlBase; + class CCtrlBaseButton; class CInterfaceGroup; } @@ -62,7 +63,7 @@ typedef CInterfacePtr::TInterfacePtr CCtrlTextButtonPtr; typedef CInterfacePtr::TInterfacePtr CViewTextPtr; typedef CInterfacePtr::TInterfacePtr CViewTextMenuPtr; typedef CInterfacePtr::TInterfacePtr CCtrlBasePtr; -typedef CInterfacePtr::TInterfacePtr CCtrlBaseButtonPtr; +typedef CInterfacePtr::TInterfacePtr CCtrlBaseButtonPtr; typedef CInterfacePtr::TInterfacePtr CGroupContainerPtr; #endif // NL_INTERFACE_POINTER_H diff --git a/code/ryzom/client/src/libwww.h b/code/ryzom/client/src/libwww.h index 2c6ed2ae0..ec1462bc9 100644 --- a/code/ryzom/client/src/libwww.h +++ b/code/ryzom/client/src/libwww.h @@ -25,9 +25,13 @@ extern "C" #include "WWWInit.h" } +namespace NLGUI +{ + class CCtrlBaseButton; +} + class CGroupList; class CCtrlScroll; -class CCtrlBaseButton; // ***************************************************************************