Changeset 28135 for ps

Timestamp:

Jul 3, 2024, 10:32:52 AM (7 days ago)

Author:

Stan

Message:

Finish implementing property "textcolor_selected" for list GUI objects
Fixes #6920
Patch by: @Vantha
Differential Revision: ​https://code.wildfiregames.com/D5269

Location:

ps/trunk

Files:

• binaries/data/mods/mod/gui/gui.rng (modified) (1 diff)
• source/gui/ObjectTypes/CList.cpp (modified) (2 diffs)
• source/gui/ObjectTypes/COList.cpp (modified) (2 diffs)
• source/gui/ObjectTypes/COList.h (modified) (2 diffs)

ps/trunk/binaries/data/mods/mod/gui/gui.rng

@@ -593 +593 @@
         </optional>
         <optional>
+
+
+
+
+
           <attribute name="heading"/>
         </optional>

ps/trunk/source/gui/ObjectTypes/CList.cpp

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -369 +369 @@
         }
 
-        DrawText(canvas, i, textColor, rect.TopLeft() - CVector2D(0.f, scroll - m_ItemsYPositions[i]), cliparea);
+        const CGUIColor& finalTextColor = (drawSelected && static_cast<size_t>(selected) == i && *m_TextColorSelected) ? m_TextColorSelected : textColor;
+
+        DrawText(canvas, i, finalTextColor, rect.TopLeft() - CVector2D(0.f, scroll - m_ItemsYPositions[i]), cliparea);
     }
 

ps/trunk/source/gui/ObjectTypes/COList.cpp

@@ -220 +220 @@
                     LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.data(), attr_value.c_str());
             }
+
+
+
+
+
             else if (attr_name == "hidden")
             {
@@ -436 +441 @@
             cliparea2.bottom = std::min(cliparea2.bottom, textPos.Y + rowHeight);
 
+
+
             // Draw list item
-            DrawText(canvas, objectsCount * (i +/*Heading*/1) + colIdx, column.m_TextColor, textPos, cliparea2);
+            DrawText(canvas, objectsCount * (i +/*Heading*/1) + colIdx, TextColor, textPos, cliparea2);
             xpos += width;
         }

ps/trunk/source/gui/ObjectTypes/COList.h

@@ -1 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -39 +39 @@
 
     CGUIColor m_TextColor;
+
     CStr m_Id;
     float m_Width;