From 7386a5d514b0ef7caae512446ef3363add2089da Mon Sep 17 00:00:00 2001 From: Vantha Date: Thu, 18 Dec 2025 17:00:15 +0100 Subject: [PATCH] Improve Engine.GetTextSize deprecation message (cherry picked from commit 4d08446285949f2185339c18b1d336cc0d1c00ce) Signed-off-by: phosit --- source/ps/scripting/JSInterface_Main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source/ps/scripting/JSInterface_Main.cpp b/source/ps/scripting/JSInterface_Main.cpp index e6d6500370..7ca36dc9e1 100644 --- a/source/ps/scripting/JSInterface_Main.cpp +++ b/source/ps/scripting/JSInterface_Main.cpp @@ -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)