dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve Engine.GetTextSize deprecation message

Browse source 
(cherry picked from commit 4d08446285)
Signed-off-by: phosit <phosit@autistici.org>
This commit is contained in:
Vantha 2025-12-18 17:00:15 +01:00 committed by phosit
parent 4140858066
commit 7386a5d514
No known key found for this signature in database
GPG key ID: C9430B600671C268
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/ps/scripting/JSInterface_Main.cpp
View file

@ -98,9 +98,8 @@ int GetFps()
return g_frequencyFilter->StableFrequency();
}
CSize2D GetTextSize(const std::string& fontName, const std::wstring& text)
CSize2D CalculateTextSize(const std::string& fontName, const std::wstring& text)
{
ONCE(LOGWARNING("Engine.GetTextSize is deprecated and will be removed in a future version.Use guiObject.GetPreferedTextSize for accurate text sizing or guiObject.getTextSize for sizing within GUI objects."));
float width = 0;
float height = 0;
CStrIntern _fontName(fontName);
@ -109,9 +108,17 @@ CSize2D GetTextSize(const std::string& fontName, const std::wstring& text)
return CSize2D(width, height);
}
CSize2D GetTextSize(const std::string& fontName, const std::wstring& text)
{
ONCE(LOGWARNING("Engine.GetTextSize is deprecated and will be removed in a future version. Instead use guiObject.getPreferredTextSize and dropdown.getPreferredHeaderTextSize for more convenient text sizing or guiObject.getTextSize for sizing within an object."));
return CalculateTextSize(fontName, text);
}
int GetTextWidth(const std::string& fontName, const std::wstring& text)
{
return GetTextSize(fontName, text).Width;
ONCE(LOGWARNING("Engine.GetTextWidth is deprecated and will be removed in a future version. Instead use guiObject.getPreferredTextSize and dropdown.getPreferredHeaderTextSize for more convenient text sizing or guiObject.getTextSize for sizing within an object."));
return CalculateTextSize(fontName, text).Width;
}
std::string CalculateMD5(const std::string& input)