From eaa1287653bece8a0320d7dfaea155c7cd37efb0 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 19 Nov 2018 23:04:45 +0200
Subject: [PATCH] Added icons to city buildings

---
 core/src/com/unciv/ui/cityscreen/BuildingsTable.kt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt b/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt
index 377e8421ca..375ecdfa0a 100644
--- a/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt
@@ -6,7 +6,6 @@ import com.badlogic.gdx.utils.Align
 import com.unciv.logic.city.CityInfo
 import com.unciv.models.gamebasics.Building
 import com.unciv.models.stats.Stat
-import com.unciv.models.stats.Stats
 import com.unciv.ui.utils.*
 
 
@@ -32,7 +31,7 @@ class ExpanderTab(private val title:String,skin: Skin):Table(skin){
             tab.isVisible=!tab.isVisible
         }
         add(toggle).row()
-        tab.add(innerTable)
+        tab.add(innerTable).pad(10f)
         add(tab)
     }
 }
@@ -60,14 +59,17 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
 
         if (!wonders.isEmpty()) {
             val wondersExpander = ExpanderTab("Wonders",skin)
-            for (building in wonders)
+            for (building in wonders) {
+                wondersExpander.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f))
                 wondersExpander.innerTable.add(Label(building.name, skin)).pad(5f).align(Align.left).row()
+            }
             add(wondersExpander).row()
         }
 
         if (!specialistBuildings.isEmpty()) {
             val specialistBuildingsExpander = ExpanderTab("Specialist Buildings",skin)
             for (building in specialistBuildings) {
+                specialistBuildingsExpander.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f))
                 specialistBuildingsExpander.innerTable.add(Label(building.name, skin)).pad(5f)
                 val specialistIcons = Table()
                 specialistIcons.row().size(20f).pad(5f)
@@ -85,8 +87,10 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table() {
 
         if (!others.isEmpty()) {
             val buildingsExpanderTab = ExpanderTab("Buildings",skin)
-            for (building in others)
+            for (building in others) {
+                buildingsExpanderTab.innerTable.add(ImageGetter.getConstructionImage(building.name).surroundWithCircle(30f))
                 buildingsExpanderTab.innerTable.add(Label(building.name, skin)).pad(5f).row()
+            }
             add(buildingsExpanderTab).row()
         }
         pack()