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

Fixed: Invalid css width/height when using percent value

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2019-08-09 11:08:20 +03:00
parent 923084a818
commit 39e0f4b4f2
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -723,6 +723,8 @@ namespace NLGUI
style.Width = tmpf * style.FontSize; style.Width = tmpf * style.FontSize;
else if (unit == "pt") else if (unit == "pt")
style.FontSize = tmpf / 0.75f; style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.Width = 0; // TODO: style.WidthRatio
else else
style.Width = tmpf; style.Width = tmpf;
} }
@ -739,6 +741,8 @@ namespace NLGUI
style.Height = tmpf * style.FontSize; style.Height = tmpf * style.FontSize;
else if (unit == "pt") else if (unit == "pt")
style.FontSize = tmpf / 0.75f; style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.Height = 0; // TODO: style.HeightRatio
else else
style.Height = tmpf; style.Height = tmpf;
} }
@ -755,6 +759,8 @@ namespace NLGUI
style.MaxWidth = tmpf * style.FontSize; style.MaxWidth = tmpf * style.FontSize;
else if (unit == "pt") else if (unit == "pt")
style.FontSize = tmpf / 0.75f; style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.MaxWidth = 0; // TODO: style.MaxWidthRatio
else else
style.MaxWidth = tmpf; style.MaxWidth = tmpf;
} }
@ -771,6 +777,8 @@ namespace NLGUI
style.MaxHeight = tmpf * style.FontSize; style.MaxHeight = tmpf * style.FontSize;
else if (unit == "pt") else if (unit == "pt")
style.FontSize = tmpf / 0.75f; style.FontSize = tmpf / 0.75f;
else if (unit == "%")
style.MaxHeight = 0; // TODO: style.MaxHeightRatio
else else
style.MaxHeight = tmpf; style.MaxHeight = tmpf;
} }