From 3e5638e548a62a303a5f7256c7599ef644409967 Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@wildfiregames.com>
Date: Mon, 24 May 2021 18:42:51 +0000
Subject: [PATCH] Removes hardcoded 1px width borders from GUI sprites.

Tested By: Imarok
Differential Revision: https://code.wildfiregames.com/D4008
This was SVN commit r25541.
---
 .../mods/mod/gui/common/modern/sprites.xml    | 12 ++++++----
 binaries/data/mods/mod/gui/gui.rng            | 10 --------
 .../data/mods/public/gui/common/sprites.xml   |  6 +++--
 .../data/mods/public/gui/pregame/sprites.xml  |  6 +++--
 .../public/gui/reference/civinfo/sprites.xml  |  6 +++--
 .../public/gui/reference/viewer/sprites.xml   | 23 ++++++++-----------
 .../public/gui/reference/viewer/styles.xml    |  2 +-
 .../data/mods/public/gui/session/sprites.xml  | 18 ++++++++++-----
 source/gui/CGUI.cpp                           | 13 -----------
 source/gui/CGUISprite.h                       |  5 ----
 source/gui/GUIRenderer.cpp                    | 15 ------------
 source/gui/GUIRenderer.h                      |  1 -
 12 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/binaries/data/mods/mod/gui/common/modern/sprites.xml b/binaries/data/mods/mod/gui/common/modern/sprites.xml
index 3d362f392a..7aa00b7ae8 100644
--- a/binaries/data/mods/mod/gui/common/modern/sprites.xml
+++ b/binaries/data/mods/mod/gui/common/modern/sprites.xml
@@ -9,9 +9,11 @@
 	<sprite name = "ModernScrollBack">
 		<image backcolor="43 42 40"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="0 0 0"
 		/>
+		<image backcolor="0 0 0" size="0 0 100% 1"/>
+		<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
+		<image backcolor="0 0 0" size="0 0 1 100%"/>
+		<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
 		<image texture = "global/modern/scrollback.png"
 			real_texture_placement = "0 0 15 128"
 			size = "0 0 100% 100%"
@@ -513,9 +515,11 @@
 	<sprite name="BlackBorderOnGray">
 		<image backcolor="darkgray"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="black"
 		/>
+		<image backcolor="0 0 0" size="0 0 100% 1"/>
+		<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
+		<image backcolor="0 0 0" size="0 0 1 100%"/>
+		<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
 	</sprite>
 	<!--
 	==========================================
diff --git a/binaries/data/mods/mod/gui/gui.rng b/binaries/data/mods/mod/gui/gui.rng
index 278efff58d..2213e548c7 100644
--- a/binaries/data/mods/mod/gui/gui.rng
+++ b/binaries/data/mods/mod/gui/gui.rng
@@ -827,16 +827,6 @@
             <ref name="ccolor"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="bordercolor">
-            <ref name="ccolor"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="border">
-            <ref name="bool"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="fixed_h_aspect_ratio">
             <data type="decimal"/>
diff --git a/binaries/data/mods/public/gui/common/sprites.xml b/binaries/data/mods/public/gui/common/sprites.xml
index 727efa1397..03604f6875 100644
--- a/binaries/data/mods/public/gui/common/sprites.xml
+++ b/binaries/data/mods/public/gui/common/sprites.xml
@@ -41,9 +41,11 @@
 		<image
 			backcolor="white"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="black"
 		/>
+		<image backcolor="black" size="0 0 100% 1"/>
+		<image backcolor="black" size="0 100%-1 100% 100%"/>
+		<image backcolor="black" size="0 0 1 100%"/>
+		<image backcolor="black" size="100%-1 0 100% 100%"/>
 	</sprite>
 
 	<!--
diff --git a/binaries/data/mods/public/gui/pregame/sprites.xml b/binaries/data/mods/public/gui/pregame/sprites.xml
index 0e4b406267..c04da7ebdc 100644
--- a/binaries/data/mods/public/gui/pregame/sprites.xml
+++ b/binaries/data/mods/public/gui/pregame/sprites.xml
@@ -63,9 +63,11 @@
 	<sprite name="pgUserReportBox">
 		<image backcolor="0 0 0 220"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="200 200 200"
 		/>
+		<image backcolor="200 200 200" size="0 0 100% 1"/>
+		<image backcolor="200 200 200" size="0 100%-1 100% 100%"/>
+		<image backcolor="200 200 200" size="0 0 1 100%"/>
+		<image backcolor="200 200 200" size="100%-1 0 100% 100%"/>
 	</sprite>
 
 </sprites>
diff --git a/binaries/data/mods/public/gui/reference/civinfo/sprites.xml b/binaries/data/mods/public/gui/reference/civinfo/sprites.xml
index ed683bfa09..a48ccae7e4 100644
--- a/binaries/data/mods/public/gui/reference/civinfo/sprites.xml
+++ b/binaries/data/mods/public/gui/reference/civinfo/sprites.xml
@@ -17,9 +17,11 @@
 	<sprite name="bgTooltipBox">
 		<image backcolor="0 0 0 200"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="white"
 		/>
+		<image backcolor="white" size="0 0 100% 1"/>
+		<image backcolor="white" size="0 100%-1 100% 100%"/>
+		<image backcolor="white" size="0 0 1 100%"/>
+		<image backcolor="white" size="100%-1 0 100% 100%"/>
 	</sprite>
 
 </sprites>
diff --git a/binaries/data/mods/public/gui/reference/viewer/sprites.xml b/binaries/data/mods/public/gui/reference/viewer/sprites.xml
index 49f5c7b6fa..b1822808d2 100644
--- a/binaries/data/mods/public/gui/reference/viewer/sprites.xml
+++ b/binaries/data/mods/public/gui/reference/viewer/sprites.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sprites>
-	<sprite name="IconFrame_Gold">
-		<image
-			border="true"
-			bordercolor="163 163 103"
-			backcolor="0 0 0 0"
-			size="0 0 100% 100%"
-		/>
-		<image
-			border="true"
-			bordercolor="0 0 0"
-			backcolor="0 0 0 0"
-			size="1 1 100%-1 100%-1"
-		/>
+	<sprite name="IconFrameGold">
+		<image backcolor="163 163 103" size="0 0 100% 1"/>
+		<image backcolor="163 163 103" size="0 100%-1 100% 100%"/>
+		<image backcolor="163 163 103" size="0 0 1 100%"/>
+		<image backcolor="163 163 103" size="100%-1 0 100% 100%"/>
+
+		<image backcolor="0 0 0" size="1 1 100%-1 2"/>
+		<image backcolor="0 0 0" size="1 100%-2 100%-1 100%-1"/>
+		<image backcolor="0 0 0" size="1 1 2 100%-1"/>
+		<image backcolor="0 0 0" size="100%-2 1 100%-1 100%-1"/>
 	</sprite>
 </sprites>
diff --git a/binaries/data/mods/public/gui/reference/viewer/styles.xml b/binaries/data/mods/public/gui/reference/viewer/styles.xml
index c977a45851..326a9a3bd6 100644
--- a/binaries/data/mods/public/gui/reference/viewer/styles.xml
+++ b/binaries/data/mods/public/gui/reference/viewer/styles.xml
@@ -2,7 +2,7 @@
 
 <styles>
 	<style name="IconFrame"
-		sprite="IconFrame_Gold"
+		sprite="IconFrameGold"
 		ghost="true"
 	/>
 
diff --git a/binaries/data/mods/public/gui/session/sprites.xml b/binaries/data/mods/public/gui/session/sprites.xml
index c155a6f2fd..344b713d1b 100644
--- a/binaries/data/mods/public/gui/session/sprites.xml
+++ b/binaries/data/mods/public/gui/session/sprites.xml
@@ -503,27 +503,33 @@
 		<image
 			backcolor="darkbrown"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="gold"
 		/>
+		<image backcolor="gold" size="0 0 100% 1"/>
+		<image backcolor="gold" size="0 100%-1 100% 100%"/>
+		<image backcolor="gold" size="0 0 1 100%"/>
+		<image backcolor="gold" size="100%-1 0 100% 100%"/>
 	</sprite>
 
 	<sprite name="BackgroundInformationTooltip">
 		<image
 			backcolor="0 0 0 192"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="white"
 		/>
+		<image backcolor="white" size="0 0 100% 1"/>
+		<image backcolor="white" size="0 100%-1 100% 100%"/>
+		<image backcolor="white" size="0 0 1 100%"/>
+		<image backcolor="white" size="100%-1 0 100% 100%"/>
 	</sprite>
 
 	<sprite name="BackgroundErrorTooltip">
 		<image
 			backcolor="0 0 0 192"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="red"
 		/>
+		<image backcolor="red" size="0 0 100% 1"/>
+		<image backcolor="red" size="0 100%-1 100% 100%"/>
+		<image backcolor="red" size="0 0 1 100%"/>
+		<image backcolor="red" size="100%-1 0 100% 100%"/>
 	</sprite>
 
 	<!-- ================================  ================================ -->
diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index 21d5a2978e..1f1a2a3c68 100644
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -1086,19 +1086,6 @@ void CGUI::Xeromyces_ReadImage(const XMBData& xmb, XMBElement element, CGUISprit
 			if (!ParseString<CGUIColor>(this, attr_value, Image->m_BackColor))
 				LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
 		}
-		else if (attr_name == "bordercolor")
-		{
-			if (!ParseString<CGUIColor>(this, attr_value, Image->m_BorderColor))
-				LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
-		}
-		else if (attr_name == "border")
-		{
-			bool b;
-			if (!ParseString<bool>(this, attr_value, b))
-				LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value));
-			else
-				Image->m_Border = b;
-		}
 		else
 			debug_warn(L"Invalid data - DTD shouldn't allow this");
 	}
diff --git a/source/gui/CGUISprite.h b/source/gui/CGUISprite.h
index ddb4459df5..e9e75bf445 100644
--- a/source/gui/CGUISprite.h
+++ b/source/gui/CGUISprite.h
@@ -55,7 +55,6 @@ public:
 		m_RoundCoordinates(true),
 		m_WrapMode(GL_REPEAT),
 		m_Effects(),
-		m_Border(false),
 		m_Size(CGUISize::Full()),
 		m_TextureSize(CGUISize::Full())
 	{
@@ -97,10 +96,6 @@ public:
 
 	// Color
 	CGUIColor m_BackColor;
-	CGUIColor m_BorderColor;
-
-	// 0 or 1 pixel border is the only option
-	bool m_Border;
 };
 
 /**
diff --git a/source/gui/GUIRenderer.cpp b/source/gui/GUIRenderer.cpp
index 11ed38bb3d..dc0ee9889d 100644
--- a/source/gui/GUIRenderer.cpp
+++ b/source/gui/GUIRenderer.cpp
@@ -228,7 +228,6 @@ void GUIRenderer::UpdateDrawCallCache(const CGUI& pGUI, DrawCalls& Calls, const
 		}
 
 		Call.m_BackColor = &(*cit)->m_BackColor;
-		Call.m_BorderColor = (*cit)->m_Border ? &(*cit)->m_BorderColor : nullptr;
 
 		if (!Call.m_HasTexture)
 		{
@@ -419,20 +418,6 @@ void GUIRenderer::Draw(DrawCalls& Calls)
 			shader->VertexPointer(3, GL_FLOAT, 3*sizeof(float), &data[0]);
 			glDrawArrays(GL_TRIANGLES, 0, 6);
 
-			if (cit->m_BorderColor != nullptr)
-			{
-				shader->Uniform(str_color, *cit->m_BorderColor);
-
-				data.clear();
-				ADD(Verts.left + 0.5f, Verts.top + 0.5f, 0.0f);
-				ADD(Verts.right - 0.5f, Verts.top + 0.5f, 0.0f);
-				ADD(Verts.right - 0.5f, Verts.bottom - 0.5f, 0.0f);
-				ADD(Verts.left + 0.5f, Verts.bottom - 0.5f, 0.0f);
-
-				shader->VertexPointer(3, GL_FLOAT, 3*sizeof(float), &data[0]);
-				glDrawArrays(GL_LINE_LOOP, 0, 4);
-			}
-
 			if (cit->m_EnableBlending)
 				glDisable(GL_BLEND);
 #undef ADD
diff --git a/source/gui/GUIRenderer.h b/source/gui/GUIRenderer.h
index 665bc81704..fe19814198 100644
--- a/source/gui/GUIRenderer.h
+++ b/source/gui/GUIRenderer.h
@@ -54,7 +54,6 @@ namespace GUIRenderer
 
 		CRect m_Vertices;
 
-		CGUIColor* m_BorderColor; // == nullptr for no border
 		CGUIColor* m_BackColor;
 	};