From f688254080787cc24f22fe9eab847df94e8adeb9 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 16 Dec 2022 11:39:23 +0200
Subject: [PATCH] UI improvements - added thin lines around circle icons,
 cleaner politics table

---
 core/src/com/unciv/ui/images/ImageGetter.kt              | 9 +++++----
 .../ui/overviewscreen/GlobalPoliticsOverviewTable.kt     | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/src/com/unciv/ui/images/ImageGetter.kt b/core/src/com/unciv/ui/images/ImageGetter.kt
index a2115210a5..5d0f415a0e 100644
--- a/core/src/com/unciv/ui/images/ImageGetter.kt
+++ b/core/src/com/unciv/ui/images/ImageGetter.kt
@@ -248,7 +248,7 @@ object ImageGetter {
         if (improvement != null)
             iconGroup.circle.color = getColorFromStats(improvement)
 
-        return iconGroup
+        return iconGroup.surroundWithThinCircle(Color.BLACK)
     }
 
     fun getPortraitImage(construction: String, size: Float): Group {
@@ -291,8 +291,9 @@ object ImageGetter {
         if (imageAttempter.getPathOrNull() != null && imageAttempter.getPath()!!.endsWith(nameWithoutBrackets))
             level = 0
 
+        val promotionColor = colorFromRGB(255, 226, 0)
         val circle = imageAttempter.getImage()
-            .apply { color = colorFromRGB(255, 226, 0) }
+            .apply { color = promotionColor }
             .surroundWithCircle(size)
             .apply { circle.color = colorFromRGB(0, 12, 49) }
 
@@ -304,7 +305,7 @@ object ImageGetter {
             starTable.y = size / 6f
             circle.addActor(starTable)
         }
-        return circle
+        return circle.surroundWithThinCircle(promotionColor)
     }
 
     fun religionIconExists(iconName: String) = imageExists("ReligionIcons/$iconName")
@@ -365,7 +366,7 @@ object ImageGetter {
             production.x = iconGroup.width - production.width
             iconGroup.addActor(production)
         }
-        return iconGroup
+        return iconGroup.surroundWithThinCircle(Color.BLACK)
     }
 
     fun getTechIconGroup(techName: String, circleSize: Float): IconCircleGroup {
diff --git a/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt b/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
index 525e5be90d..146e85962f 100644
--- a/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
+++ b/core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
@@ -81,8 +81,10 @@ class GlobalPoliticsOverviewTable (
         addSeparatorVertical(Color.GRAY)
         add("Wonders".toLabel())
         addSeparatorVertical(Color.GRAY)
-        add("Relations".toLabel())
-        add(diagramButton).pad(10f)
+        add(Table().apply {
+            add("Relations".toLabel()).row()
+            add(diagramButton).pad(10f)
+        })
         row()
         addSeparator(Color.GRAY)