From 3a4ed7aafb980b39ab94d73ef4435f81ebc7ec70 Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Thu, 4 Dec 2025 16:00:10 -0600
Subject: [PATCH] feat(ui): properly name and place CLayoutFrame::HasPoints

---
 src/ui/CLayoutFrame.cpp      | 12 ++++++++++++
 src/ui/CLayoutFrame.hpp      |  1 +
 src/ui/CSimpleButton.cpp     |  2 +-
 src/ui/CSimpleFontString.cpp | 13 -------------
 src/ui/CSimpleFontString.hpp |  1 -
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/ui/CLayoutFrame.cpp b/src/ui/CLayoutFrame.cpp
index 24f84d7..79a9a23 100644
--- a/src/ui/CLayoutFrame.cpp
+++ b/src/ui/CLayoutFrame.cpp
@@ -359,6 +359,18 @@ float CLayoutFrame::GetWidth() {
     return this->m_width;
 }
 
+int32_t CLayoutFrame::HasPoints() {
+    for (int32_t i = 0; i < FRAMEPOINT_NUMPOINTS; i++) {
+        auto point = this->m_points[i];
+
+        if (point && !(point->m_flags & 0x8)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
 int32_t CLayoutFrame::IsAttachmentOrigin() {
     return 0;
 }
diff --git a/src/ui/CLayoutFrame.hpp b/src/ui/CLayoutFrame.hpp
index 5e97ba6..de71074 100644
--- a/src/ui/CLayoutFrame.hpp
+++ b/src/ui/CLayoutFrame.hpp
@@ -71,6 +71,7 @@ class CLayoutFrame {
         void GetFirstPointX(const FRAMEPOINT* const pointarray, int32_t elements, float& x);
         void GetFirstPointY(const FRAMEPOINT* const pointarray, int32_t elements, float& y);
         int32_t GetRect(CRect* rect);
+        int32_t HasPoints();
         int32_t IsResizeDependency(CLayoutFrame* dependentFrame);
         uint32_t IsResizePending();
         float Left();
diff --git a/src/ui/CSimpleButton.cpp b/src/ui/CSimpleButton.cpp
index 777afd6..17b238d 100644
--- a/src/ui/CSimpleButton.cpp
+++ b/src/ui/CSimpleButton.cpp
@@ -492,7 +492,7 @@ void CSimpleButton::SetFontString(CSimpleFontString* text) {
     if (text) {
         text->SetFrame(this, DRAWLAYER_ARTWORK, 1);
 
-        if (!text->Sub482AC0()) {
+        if (!text->HasPoints()) {
             auto font = this->m_normalFont;
             uint32_t styleFlags = font ? font->m_attributes.m_styleFlags : 0x0;
 
diff --git a/src/ui/CSimpleFontString.cpp b/src/ui/CSimpleFontString.cpp
index a10e9f0..b5319d8 100644
--- a/src/ui/CSimpleFontString.cpp
+++ b/src/ui/CSimpleFontString.cpp
@@ -823,19 +823,6 @@ void CSimpleFontString::SetText(const char* text, int32_t a3) {
     this->ClearString();
 }
 
-// Probably belongs on CLayoutFrame
-int32_t CSimpleFontString::Sub482AC0() {
-    for (int32_t i = 0; i < FRAMEPOINT_NUMPOINTS; i++) {
-        auto point = this->m_points[i];
-
-        if (point && !(point->m_flags & 0x8)) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 void CSimpleFontString::SetTextLength(uint32_t a2) {
     // TODO
 }
diff --git a/src/ui/CSimpleFontString.hpp b/src/ui/CSimpleFontString.hpp
index 4af87f1..988820f 100644
--- a/src/ui/CSimpleFontString.hpp
+++ b/src/ui/CSimpleFontString.hpp
@@ -84,7 +84,6 @@ class CSimpleFontString : public CSimpleRegion, public CSimpleFontable {
         void SetStyleFlags(uint32_t styleFlags);
         void SetText(const char* text, int32_t a3);
         void SetTextLength(uint32_t a2);
-        int32_t Sub482AC0();
         void UpdateString();
 };