From 1db11c0df42b50fa5d699a41650863a3c278a917 Mon Sep 17 00:00:00 2001 From: Vantha Date: Sat, 9 May 2026 12:26:00 +0200 Subject: [PATCH] Don't check all scrollbars' visibility in CText The CText class is designed to only work with one scrollbar, so the any_of was pointless. --- source/gui/ObjectTypes/CText.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/gui/ObjectTypes/CText.cpp b/source/gui/ObjectTypes/CText.cpp index a251210c2b..41ece6474c 100644 --- a/source/gui/ObjectTypes/CText.cpp +++ b/source/gui/ObjectTypes/CText.cpp @@ -97,7 +97,7 @@ void CText::SetupText() GetScrollBar(0).SetPos(0.0f); } - if (!m_ScrollBar || !std::ranges::any_of(m_ScrollBars, &IGUIScrollBar::IsVisible)) + if (!m_ScrollBar || !GetScrollBar(0).IsVisible()) CalculateTextPosition(GetActualSize(), m_TextPos, m_GeneratedTexts[0]); } @@ -204,7 +204,7 @@ void CText::Draw(CCanvas2D& canvas) const CGUIColor& color = m_Enabled ? m_TextColor : m_TextColorDisabled; - if (m_ScrollBar && std::ranges::any_of(m_ScrollBars, &IGUIScrollBar::IsVisible)) + if (m_ScrollBar && GetScrollBar(0).IsVisible()) { DrawText(canvas, 0, color, GetActualSize().TopLeft() - CVector2D(0.f, scroll), cliparea); // Draw scrollbars on top of the content