From 79dbba940613bd70aa61c6f9c74657d164922ef2 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Wed, 11 Nov 2026 14:01:31 +0000 Subject: [PATCH] Decompile 4 functions in Source/UI/Window/UIWindow.cpp Batch #17107 by eAthena: 0 byte-identical, 4 confirmed by peer review. - fn_16931 UIWindow::Update: logic confirmed by peer review - fn_17023 UIWindow::DrawFormattedText: logic confirmed by peer review - fn_16976 UIWindow::FormattedTextWidth: logic confirmed by peer review - fn_03636 UINavigationV4Wnd::InsertNavigationLink: logic confirmed by peer review Peer-reviewed-by: alisonrag, Toshiro, br4yan Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- Source/UI/Window/UIWindow.cpp | 96 +++++++++++++---------------------- 1 file changed, 36 insertions(+), 60 deletions(-) diff --git a/Source/UI/Window/UIWindow.cpp b/Source/UI/Window/UIWindow.cpp index ace4d966a..ab1b6806f 100644 --- a/Source/UI/Window/UIWindow.cpp +++ b/Source/UI/Window/UIWindow.cpp @@ -496,41 +496,40 @@ bool UIWindow::Update(int redraw) { } CDCBitmap& source = *static_cast(this->geometry.surface); - if (this->m_clip == 0) { + if (this->m_clip != 0) { + const int x = this->geometry.x >= 0 ? this->geometry.x : 0; + int width = this->geometry.width; + int sourceX; + if (this->geometry.x < 0) { + width += this->geometry.x; + sourceX = -this->geometry.x; + } else { + sourceX = 0; + } + + if (parentWindow->geometry.width < (x + width)) { + width = (parentWindow->geometry.width - x); + } + + const int y = this->geometry.y >= 0 ? this->geometry.y : 0; + int height = this->geometry.height; + int sourceY; + if (this->geometry.y < 0) { + height += this->geometry.y; + sourceY = -this->geometry.y; + } else { + sourceY = 0; + } + + if (parentWindow->geometry.height < (y + height)) { + height = (parentWindow->geometry.height - y); + } + + if (width > 0 && height > 0) { + parentWindow->geometry.surface->CopyFrom(x, y, sourceX, sourceY, width, height, source); + } + } else { parentWindow->geometry.surface->BlendFrom(this->geometry.x, this->geometry.y, this->geometry.width, this->geometry.height, source); - return true; - } - - const int x = this->geometry.x >= 0 ? this->geometry.x : 0; - int width = this->geometry.width; - int sourceX; - if (this->geometry.x < 0) { - width += this->geometry.x; - sourceX = -this->geometry.x; - } else { - sourceX = 0; - } - - if (parentWindow->geometry.width < (x + width)) { - width = (parentWindow->geometry.width - x); - } - - const int y = this->geometry.y >= 0 ? this->geometry.y : 0; - int height = this->geometry.height; - int sourceY; - if (this->geometry.y < 0) { - height += this->geometry.y; - sourceY = -this->geometry.y; - } else { - sourceY = 0; - } - - if (parentWindow->geometry.height < (y + height)) { - height = (parentWindow->geometry.height - y); - } - - if (width > 0 && height > 0) { - parentWindow->geometry.surface->CopyFrom(x, y, sourceX, sourceY, width, height, source); } return true; @@ -1115,19 +1114,7 @@ void UIWindow::DrawFormattedText(int x, int y, const std::string& text, int widt } const char* const next = CharNextExA(static_cast(g_textCodePage), current, 0); - int advance = 0; - { - const std::string character(current, next); - const char* const measured = character.c_str(); - if (measured) { - const unsigned bytes = static_cast(std::strlen(measured)); - if (bytes) { - TextContext context(*this->geometry.surface); - context.SetFont(family, height, currentBold, 0); - advance = context.Measure(measured, bytes).cx; - } - } - } + const int advance = this->TextWidth(std::string(current, next).c_str(), 0, family, height, currentBold, 0); { const std::string character(current, next); @@ -1432,18 +1419,7 @@ int UIWindow::FormattedTextWidth(std::string text, int family, int height, unsig const char* next = CharNextExA(static_cast(g_textCodePage), current, 0); const std::string character(current, next); - const char* const measured = character.c_str(); - int advance = 0; - if (measured) { - const unsigned bytes = static_cast(std::strlen(measured)); - if (bytes) { - TextContext context(*this->geometry.surface); - context.SetFont(family, height, currentBold, 0); - advance = context.Measure(measured, bytes).cx; - } - } - - total += advance; + total += this->TextWidth(character.c_str(), 0, family, height, currentBold, 0); current = next; } @@ -3345,7 +3321,7 @@ void UINavigationV4Wnd::InsertNavigationLink(std::string name, int x, int y) { link += g_windowNaviLinkCloseTag; if (g_windowMgr.GetHoverWindow() && g_windowMgr.GetHoverWindow()->geometry.id != 516) { - if (g_windowMgr.GetHoverWindow() == ChatWindow()->m_suggestions && !g_windowMgr.inputSuggestionsEnabled) { + if (ChatWindow()->m_suggestions == g_windowMgr.GetHoverWindow() && !g_windowMgr.inputSuggestionsEnabled) { ChatWindow()->ToggleInput(); } } else if (!g_windowMgr.inputSuggestionsEnabled) {