Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Set background image from html or body

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2019-05-03 08:59:19 +03:00
parent 9f9c5d4106
commit 4f4ba7120d
2 changed files with 59 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/include/nel/gui/group_html.h
View file

@ -816,6 +816,9 @@ namespace NLGUI
// :before, :after rendering
void renderPseudoElement(const std::string &pseudo, const CHtmlElement &elm);
// apply background from current style (for html, body)
void applyBackground(const CHtmlElement &elm);
// HTML elements
void htmlA(const CHtmlElement &elm);
void htmlAend(const CHtmlElement &elm);

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

@ -3379,6 +3379,13 @@ namespace NLGUI
bitmap->setRenderLayer(-2);
bitmap->setScale(scale);
bitmap->setTile(tile);
// clear size ref for non-scaled image or it does not show up
if (scale || tile)
bitmap->setSizeRef("wh");
else
bitmap->setSizeRef("");
addImageDownload(bgtex, view);
}
}
@ -5015,6 +5022,52 @@ namespace NLGUI
_CellParams.push_back (cellParams);
}
// ***************************************************************************
void CGroupHTML::applyBackground(const CHtmlElement &elm)
{
bool root = elm.Value == "html" || elm.Value == "body";
// non-empty image
if (_Style.hasStyle("background-image"))
{
// value '1' and 'background-scale' are ryzom only
bool repeat = _Style.checkStyle("background-repeat", "1") || _Style.checkStyle("background-repeat", "repeat");
bool scale = _Style.checkStyle("background-scale", "1") || _Style.checkStyle("background-size", "100% 100%");
std::string image = trim(_Style.getStyle("background-image"));
string::size_type texExt = toLower(image).find("url(");
if (texExt != string::npos)
{
image = image.substr(texExt+4, image.size()-texExt-5);
}
if (!image.empty())
{
if (root)
{
setBackground (image, scale, repeat);
}
// TODO: else
// default background color is transparent, so image does not show
if (!_Style.hasStyle("background-color"))
{
_Style.applyStyle("background-color: #fff;");
}
}
}
if (_Style.hasStyle("background-color"))
{
CRGBA bgColor = _Style.Current.BackgroundColor;
scanHTMLColor(elm.getAttribute("bgcolor").c_str(), bgColor);
if (root)
{
setBackgroundColor(bgColor);
}
// TODO: else
}
}
// ***************************************************************************
void CGroupHTML::htmlA(const CHtmlElement &elm)
{
@ -5084,39 +5137,7 @@ namespace NLGUI
_Style.applyStyle("background-color: " + elm.getAttribute("bgcolor"));
}
if (_Style.hasStyle("background-color"))
{
CRGBA bgColor = _Style.Current.BackgroundColor;
scanHTMLColor(elm.getAttribute("bgcolor").c_str(), bgColor);
setBackgroundColor(bgColor);
}
if (elm.hasNonEmptyAttribute("style"))
{
string style = elm.getAttribute("style");
TStyle styles = parseStyle(style);
TStyle::iterator it;
it = styles.find("background-repeat");
bool repeat = (it != styles.end() && it->second == "1");
// Webig only
it = styles.find("background-scale");
bool scale = (it != styles.end() && it->second == "1");
it = styles.find("background-image");
if (it != styles.end())
{
string image = it->second;
string::size_type texExt = toLower(image).find("url(");
// Url image
if (texExt != string::npos)
// Remove url()
image = image.substr(4, image.size()-5);
setBackground (image, scale, repeat);
}
}
applyBackground(elm);
renderPseudoElement(":before", elm);
}
@ -5468,7 +5489,7 @@ namespace NLGUI
_Style.applyRootStyle(elm.getAttribute("style"));
_Style.Current = _Style.Root;
}
setBackgroundColor(_Style.Current.BackgroundColor);
applyBackground(elm);
}
// ***************************************************************************
@ -6278,7 +6299,7 @@ namespace NLGUI
if (_Style.checkStyle("background-repeat", "1") || _Style.checkStyle("background-repeat", "repeat"))
_Cells.back()->setTextureTile(true);
if (_Style.checkStyle("background-scale", "1") || _Style.checkStyle("background-size", "cover"))
if (_Style.checkStyle("background-scale", "1") || _Style.checkStyle("background-size", "100% 100%"))
_Cells.back()->setTextureScale(true);
if (_Style.hasStyle("background-image"))