Fixed misplaced text on radio buttons in UI in CS (#382)

OpenXRay · Feb 10, 2024 · d58bf5b · d58bf5b
1 parent 6ce635b
commit d58bf5b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 20 deletions.
diff --git a/src/xrUICore/Buttons/UIRadioButton.cpp b/src/xrUICore/Buttons/UIRadioButton.cpp
@@ -6,17 +6,15 @@ void CUIRadioButton::InitButton(Fvector2 pos, Fvector2 size)
 {
     inherited::InitButton(pos, size);
 
-    TextItemControl();
     CUI3tButton::InitTexture("ui_radio");
 
-    Fvector2 sz = m_background->Get(S_Enabled)->GetStaticItem()->GetSize();
+    const Fvector2 sz = m_background->Get(S_Enabled)->GetStaticItem()->GetSize();
     TextItemControl()->m_TextOffset.x = sz.x;
 
-    CUI3tButton::InitButton(pos, Fvector2().set(size.x, sz.y - 5.0f));
+    CUI3tButton::InitButton(pos, { size.x, sz.y - 5.0f });
 
     TextItemControl()->m_wndPos.set(pos);
-    TextItemControl()->m_wndSize.set(
-        Fvector2().set(size.x, m_background->Get(S_Enabled)->GetStaticItem()->GetSize().y));
+    TextItemControl()->m_wndSize.set({ size.x, m_background->Get(S_Enabled)->GetStaticItem()->GetSize().y });
 }
 
 bool CUIRadioButton::InitTexture(pcstr /*texture*/, bool /*fatal = true*/)

diff --git a/src/xrUICore/Buttons/UIRadioButton.h b/src/xrUICore/Buttons/UIRadioButton.h
@@ -8,7 +8,6 @@ class CUIRadioButton final : public CUITabButton
 public:
     virtual void InitButton(Fvector2 pos, Fvector2 size);
     virtual bool InitTexture(pcstr texture, bool fatal = true);
-    virtual void SetTextX(float x) { /*do nothing*/}
     bool OnMouseDown(int mouse_btn) override;
     pcstr GetDebugType() override { return "CUIRadioButton"; }
 };
diff --git a/src/xrUICore/ListWnd/UIListItem.cpp b/src/xrUICore/ListWnd/UIListItem.cpp
@@ -28,7 +28,7 @@ void CUIListItem::InitListItem(Fvector2 pos, Fvector2 size)
 void CUIListItem::InitTexture(pcstr tex_name)
 {
     CUIButton::InitTexture(tex_name);
-    SetTextX(m_UIStaticItem.GetTextureRect().width());
+    TextItemControl()->m_TextOffset.x = m_UIStaticItem.GetTextureRect().width();
 }
 
 /*

diff --git a/src/xrUICore/Static/UIStatic.h b/src/xrUICore/Static/UIStatic.h
@@ -60,11 +60,6 @@ class XRUICORE_API CUIStatic : public CUIWindow, public ITextureOwner, public CU
         TextItemControl()->m_TextOffset.y = y;
     }
 
-    virtual void SetTextX(float text_x) { TextItemControl()->m_TextOffset.x = text_x; }
-    virtual void SetTextY(float text_y) { TextItemControl()->m_TextOffset.y = text_y; }
-    virtual float GetTextX() { return TextItemControl()->m_TextOffset.x; }
-    virtual float GetTextY() { return TextItemControl()->m_TextOffset.y; }
-
     virtual void SetColor(u32 color) { m_UIStaticItem.SetColor(color); }
     virtual u32 GetColor() const { return m_UIStaticItem.GetColor(); }
 

diff --git a/src/xrUICore/Static/UIStatic_script.cpp b/src/xrUICore/Static/UIStatic_script.cpp
@@ -44,10 +44,11 @@ SCRIPT_EXPORT(CUIStatic, (CUIWindow),
 
             .def("GetText", &CUIStatic::GetText)
 
-            .def("SetTextX", &CUIStatic::SetTextX)
-            .def("SetTextY", &CUIStatic::SetTextY)
-            .def("GetTextX", &CUIStatic::GetTextX)
-            .def("GetTextY", &CUIStatic::GetTextY)
+            .def("SetTextOffset", &CUIStatic::SetTextOffset)
+            .def("SetTextX", +[](CUIStatic* self, float x) { self->TextItemControl()->m_TextOffset.x = x; })
+            .def("SetTextY", +[](CUIStatic* self, float y) { self->TextItemControl()->m_TextOffset.y = y; })
+            .def("GetTextX", +[](CUIStatic* self) { return self->TextItemControl()->m_TextOffset.x; })
+            .def("GetTextY", +[](CUIStatic* self) { return self->TextItemControl()->m_TextOffset.y; })
 
             .def("SetColor", &CUIStatic::SetColor)
             .def("GetColor", &CUIStatic::GetColor)
@@ -66,7 +67,6 @@ SCRIPT_EXPORT(CUIStatic, (CUIWindow),
 
             .def("AdjustHeightToText", &CUIStatic::AdjustHeightToText)
             .def("AdjustWidthToText", &CUIStatic::AdjustWidthToText)
-            .def("SetTextOffset", &CUIStatic::SetTextOffset)
 
             .def("Init", +[](CUIStatic* self, float x, float y, float width, float height)
             {

diff --git a/src/xrUICore/XML/UIXmlInitBase.cpp b/src/xrUICore/XML/UIXmlInitBase.cpp
@@ -307,10 +307,10 @@ bool CUIXmlInitBase::InitText(CUIXml& xml_doc, LPCSTR path, int index, CUILines*
     pLines->SetTextComplexMode(xml_doc.ReadAttribInt(path, index, "complex_mode", 0) ? true : false);
 
     // Text coordinates
-    float text_x = xml_doc.ReadAttribFlt(path, index, "x", 0);
-    float text_y = xml_doc.ReadAttribFlt(path, index, "y", 0);
+    const float text_x = xml_doc.ReadAttribFlt(path, index, "x", 0.0f);
+    const float text_y = xml_doc.ReadAttribFlt(path, index, "y", 0.0f);
 
-    pLines->m_TextOffset.set(text_x, text_y);
+    pLines->m_TextOffset.add({ text_x, text_y });
 
     shared_str text = xml_doc.Read(path, index, NULL);
     if (text.size())