aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-29 05:18:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Refactor CViewLink to be able to use custom action handlers

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2017-01-21 13:29:20 +02:00
parent d7a797bf4a
commit 9d0a2556d0
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/include/nel/gui/group_paragraph.h
View file

@ -206,12 +206,6 @@ namespace NLGUI
invalidateContent(); invalidateContent();
} }
// Set the HTML group used for links
void setBrowseGroup (CInterfaceElement *group)
{
_BrowseGroup = group;
}
/// \from CInterfaceElement /// \from CInterfaceElement
void onInvalidateContent(); void onInvalidateContent();
sint32 getMaxUsedW() const; sint32 getMaxUsedW() const;
@ -293,9 +287,6 @@ namespace NLGUI
// The links // The links
std::vector<CLink> _Links; std::vector<CLink> _Links;
// The HTML group used
CInterfaceElement *_BrowseGroup;
private: private:
std::string _HardText; std::string _HardText;
uint32 _TextId; uint32 _TextId;

11
code/nel/include/nel/gui/view_link.h
View file

@ -50,10 +50,21 @@ namespace NLGUI
void setHTMLView( CGroupHTML *html); void setHTMLView( CGroupHTML *html);
bool getMouseOverShape(std::string &texName, uint8 &rot, NLMISC::CRGBA &col); bool getMouseOverShape(std::string &texName, uint8 &rot, NLMISC::CRGBA &col);
void setActionOnLeftClick(const std::string &actionHandler) { _AHOnLeftClick = actionHandler; };
void setParamsOnLeftClick(const std::string &actionParams) { _AHOnLeftClickParams = actionParams; };
const std::string &getActionOnLeftClick() const { return _AHOnLeftClick; }
const std::string &getParamsOnLeftClick() const { return _AHOnLeftClickParams; }
protected: protected:
// The main HTML group // The main HTML group
CGroupHTML *HTML; CGroupHTML *HTML;
// Left mouse click action
// Don't use CStringShared as URLs change past values would be permanently remembered.
std::string _AHOnLeftClick;
std::string _AHOnLeftClickParams;
}; };
} }

4
code/nel/src/gui/group_html.cpp
View file

@ -3773,7 +3773,6 @@ namespace NLGUI
CGroupParagraph *newParagraph = new CGroupParagraph(CViewBase::TCtorParam()); CGroupParagraph *newParagraph = new CGroupParagraph(CViewBase::TCtorParam());
newParagraph->setResizeFromChildH(true); newParagraph->setResizeFromChildH(true);
newParagraph->setBrowseGroup (this);
newParagraph->setIndent(_Indent); newParagraph->setIndent(_Indent);
// Add to the group // Add to the group
@ -4127,6 +4126,9 @@ namespace NLGUI
if (!newLink->Link.empty()) if (!newLink->Link.empty())
{ {
newLink->setHTMLView (this); newLink->setHTMLView (this);
newLink->setActionOnLeftClick("browse");
newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
} }
} }
newLink->setText(tmpStr); newLink->setText(tmpStr);

8
code/nel/src/gui/group_paragraph.cpp
View file

@ -59,7 +59,6 @@ namespace NLGUI
_TopSpace = 0; _TopSpace = 0;
_Indent = 0; _Indent = 0;
_FirstViewIndentView = false; _FirstViewIndentView = false;
_BrowseGroup = NULL;
_TextId = 0; _TextId = 0;
} }
@ -868,11 +867,8 @@ namespace NLGUI
ctrl->setParentPosRef (Hotspot_TL); ctrl->setParentPosRef (Hotspot_TL);
ctrl->setPosRef (Hotspot_TL); ctrl->setPosRef (Hotspot_TL);
ctrl->setActive(true); ctrl->setActive(true);
if (_BrowseGroup) ctrl->setActionOnLeftClick(link.Link->getActionOnLeftClick());
{ ctrl->setParamsOnLeftClick(link.Link->getParamsOnLeftClick());
ctrl->setActionOnLeftClick("browse");
ctrl->setParamsOnLeftClick("name="+_BrowseGroup->getId()+"|url="+link.Link->Link);
}
ctrl->setScale(true); ctrl->setScale(true);
addCtrl(ctrl); addCtrl(ctrl);
} }