diff --git a/core/src/com/unciv/ui/cityscreen/CityInfoTable.kt b/core/src/com/unciv/ui/cityscreen/CityInfoTable.kt index 042430bdbd..229b894242 100644 --- a/core/src/com/unciv/ui/cityscreen/CityInfoTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityInfoTable.kt @@ -45,7 +45,7 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS val width = cityScreen.stage.width/4 - 2*pad val showHideTableWrapper = Table() showHideTableWrapper.add(showHideTable).width(width) - titleTable.add(str.toLabel().setFontSize(22)) + titleTable.add(str.toLabel().setFontSize(24)) titleTable.onClick { if(showHideTableWrapper.hasChildren()) showHideTableWrapper.clear() else showHideTableWrapper.add(showHideTable).width(width) diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt index d3299cd049..be4f57d722 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt @@ -39,20 +39,7 @@ class CityScreenCityPickerTable(val cityScreen: CityScreen) : Table(){ } val currentCityLabel = Label(city.name + " (" + city.population.population + ")", CameraStageBaseScreen.skin) - currentCityLabel.setFontSize(25) - currentCityLabel.onClick { - val editCityNamePopup = PopupTable(cityScreen) - val textArea = TextField(city.name, CameraStageBaseScreen.skin) - textArea.setAlignment(Align.center) - editCityNamePopup.add(textArea).colspan(2).row() - editCityNamePopup.addCloseButton() - editCityNamePopup.addButton("Save".tr()){ - city.name = textArea.text - cityScreen.game.screen = CityScreen(city) - } - editCityNamePopup.open() - } - + currentCityLabel.setFontSize(30) cityNameTable.add(currentCityLabel) add(cityNameTable) diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 54c69c915f..e557d934fd 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -126,7 +126,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski .fillY() // provide full-height clicking area if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer()) - iconTable.add(getConstructionGroup(city.cityConstructions)).padRight(10f) + iconTable.add(getConstructionGroup(city.cityConstructions)).padRight(10f).padLeft(10f) else if (city.civInfo.isMajorCiv()) { val nationIcon = ImageGetter.getNationIcon(city.civInfo.nation.name) nationIcon.color = secondaryColor @@ -176,7 +176,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski val turnsToConstruction = cityConstructions.turnsToConstruction(cityCurrentConstruction.name) val label = turnsToConstruction.toString().toLabel() label.setFontColor(secondaryColor) - label.setFontSize(10) + label.setFontSize(14) label.pack() group.addActor(label) diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 23a763a175..c045efef0d 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -254,7 +254,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() { buttonPic.background = ImageGetter.getDrawable("OtherIcons/civTableBackground") .tint(colorFromRGB(7, 46, 43)) buttonPic.defaults().pad(10f) - buttonPic.add("{Pick a tech}!".toLabel().setFontColor(Color.WHITE).setFontSize(22)) + buttonPic.add("{Pick a tech}!".toLabel().setFontColor(Color.WHITE).setFontSize(30)) techButtonHolder.add(buttonPic) } else {