From 95354964ba4a668b39f83f829cddcb09cd41b58d Mon Sep 17 00:00:00 2001
From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Date: Wed, 4 Mar 2020 01:54:20 +0800
Subject: [PATCH] some UI update. (#2069)

---
 core/src/com/unciv/ui/EmpireOverviewScreen.kt     |  3 ++-
 .../ui/cityscreen/SpecialistAllocationTable.kt    | 15 ++++++++-------
 core/src/com/unciv/ui/trade/DiplomacyScreen.kt    |  7 +++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
index df3c21ea81..daf61ef687 100644
--- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt
+++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
@@ -26,7 +26,8 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo) : CameraS
     init {
         onBackButtonClicked { UncivGame.Current.setWorldScreen() }
 
-        val closeButton = TextButton("Close".tr(), skin)
+        val closeButton = "×".toLabel(Color.BLACK,30).apply { this.setAlignment(Align.center) }
+                .surroundWithCircle(30f).apply { circle.color=Color.RED }
         closeButton.onClick { UncivGame.Current.setWorldScreen() }
         closeButton.y = stage.height - closeButton.height - 5
         topTable.add(closeButton)
diff --git a/core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt b/core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt
index bb034d6a62..1f836baeab 100644
--- a/core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/SpecialistAllocationTable.kt
@@ -1,8 +1,9 @@
 package com.unciv.ui.cityscreen
 
+import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Actor
 import com.badlogic.gdx.scenes.scene2d.ui.Table
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton
+import com.badlogic.gdx.utils.Align
 import com.unciv.UncivGame
 import com.unciv.models.stats.Stat
 import com.unciv.ui.utils.*
@@ -47,29 +48,29 @@ class SpecialistAllocationTable(val cityScreen: CityScreen): Table(CameraStageBa
 
     private fun getAssignButton(assignedSpecialists: Int, maxSpecialists: Int, stat: Stat):Actor {
         if (assignedSpecialists >= maxSpecialists || cityInfo.isPuppet) return Table()
-        val assignButton = TextButton("+", skin)
-        assignButton.label.setFontSize(24)
+        val assignButton = "+".toLabel(Color.BLACK,24).apply { this.setAlignment(Align.center) }
+                .surroundWithCircle(30f).apply { circle.color= Color.GREEN }
         assignButton.onClick {
             cityInfo.population.specialists.add(stat, 1f)
             cityInfo.cityStats.update()
             cityScreen.update()
         }
         if (cityInfo.population.getFreePopulation() == 0 || !UncivGame.Current.worldScreen.isPlayersTurn)
-            assignButton.disable()
+            assignButton.clear()
         return assignButton
     }
 
     private fun getUnassignButton(assignedSpecialists: Int, stat: Stat):Actor {
         if (assignedSpecialists <= 0 || cityInfo.isPuppet) return Table()
 
-        val unassignButton = TextButton("-", skin)
-        unassignButton.label.setFontSize(24)
+        val unassignButton = "-".toLabel(Color.BLACK,24).apply { this.setAlignment(Align.center) }
+                .surroundWithCircle(30f).apply { circle.color= Color.RED }
         unassignButton.onClick {
             cityInfo.population.specialists.add(stat, -1f)
             cityInfo.cityStats.update()
             cityScreen.update()
         }
-        if (!UncivGame.Current.worldScreen.isPlayersTurn) unassignButton.disable()
+        if (!UncivGame.Current.worldScreen.isPlayersTurn) unassignButton.clear()
         return unassignButton
     }
 
diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
index fcc31f5a89..21267dc454 100644
--- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
+++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
@@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
 import com.badlogic.gdx.scenes.scene2d.ui.SplitPane
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
+import com.badlogic.gdx.utils.Align
 import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.logic.civilization.AlertType
@@ -41,11 +42,9 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
         stage.addActor(splitPane)
 
 
-        val closeButton = TextButton("Close".tr(), skin)
+        val closeButton = "×".toLabel(Color.BLACK,24).apply { this.setAlignment(Align.center) }
+                .surroundWithCircle(24f).apply { circle.color=Color.RED }
         closeButton.onClick { UncivGame.Current.setWorldScreen() }
-        closeButton.label.setFontSize(24)
-        closeButton.labelCell.pad(10f)
-        closeButton.pack()
         closeButton.y = stage.height - closeButton.height - 10
         closeButton.x = 10f
         stage.addActor(closeButton) // This must come after the split pane so it will be above, that the button will be clickable