mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 17:28:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

UI improvements - added thin lines around circle icons, cleaner politics table

Browse Source
This commit is contained in:
Yair Morgenstern
2022-12-16 11:39:23 +02:00
parent c95befaf1b
commit f688254080
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/images/ImageGetter.kt
View File

@ -248,7 +248,7 @@ object ImageGetter {
if (improvement != null) if (improvement != null)
iconGroup.circle.color = getColorFromStats(improvement) iconGroup.circle.color = getColorFromStats(improvement)
return iconGroup return iconGroup.surroundWithThinCircle(Color.BLACK)
} }
fun getPortraitImage(construction: String, size: Float): Group { fun getPortraitImage(construction: String, size: Float): Group {
@ -291,8 +291,9 @@ object ImageGetter {
if (imageAttempter.getPathOrNull() != null && imageAttempter.getPath()!!.endsWith(nameWithoutBrackets)) if (imageAttempter.getPathOrNull() != null && imageAttempter.getPath()!!.endsWith(nameWithoutBrackets))
level = 0 level = 0
val promotionColor = colorFromRGB(255, 226, 0)
val circle = imageAttempter.getImage() val circle = imageAttempter.getImage()
.apply { color = colorFromRGB(255, 226, 0) } .apply { color = promotionColor }
.surroundWithCircle(size) .surroundWithCircle(size)
.apply { circle.color = colorFromRGB(0, 12, 49) } .apply { circle.color = colorFromRGB(0, 12, 49) }
@ -304,7 +305,7 @@ object ImageGetter {
starTable.y = size / 6f starTable.y = size / 6f
circle.addActor(starTable) circle.addActor(starTable)
} }
return circle return circle.surroundWithThinCircle(promotionColor)
} }
fun religionIconExists(iconName: String) = imageExists("ReligionIcons/$iconName") fun religionIconExists(iconName: String) = imageExists("ReligionIcons/$iconName")
@ -365,7 +366,7 @@ object ImageGetter {
production.x = iconGroup.width - production.width production.x = iconGroup.width - production.width
iconGroup.addActor(production) iconGroup.addActor(production)
} }
return iconGroup return iconGroup.surroundWithThinCircle(Color.BLACK)
} }
fun getTechIconGroup(techName: String, circleSize: Float): IconCircleGroup { fun getTechIconGroup(techName: String, circleSize: Float): IconCircleGroup {

4
core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
View File

@ -81,8 +81,10 @@ class GlobalPoliticsOverviewTable (
addSeparatorVertical(Color.GRAY) addSeparatorVertical(Color.GRAY)
add("Wonders".toLabel()) add("Wonders".toLabel())
addSeparatorVertical(Color.GRAY) addSeparatorVertical(Color.GRAY)
add("Relations".toLabel()) add(Table().apply {
add("Relations".toLabel()).row()
add(diagramButton).pad(10f) add(diagramButton).pad(10f)
})
row() row()
addSeparator(Color.GRAY) addSeparator(Color.GRAY)