gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Improve Engine.GetTextSize deprecation message

Browse Source
This commit is contained in:
Vantha
2025-12-18 17:00:15 +01:00
parent 670f1e5d42
commit 4d08446285
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/scripting/JSInterface_Main.cpp
+10 -3
View File
@@ -98,9 +98,8 @@ int GetFps()
return g_frequencyFilter->StableFrequency(); 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 width = 0;
float height = 0; float height = 0;
CStrIntern _fontName(fontName); CStrIntern _fontName(fontName);
@@ -109,9 +108,17 @@ CSize2D GetTextSize(const std::string& fontName, const std::wstring& text)
return CSize2D(width, height); 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) 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) std::string CalculateMD5(const std::string& input)