AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Diplomacy graph size scales with screen space available (#1495)

Browse Source 
* Diplomacy graph size scales with screen space available

* Deleted debug option left on
This commit is contained in:
r3versi 2019-12-21 18:50:01 +01:00 committed by Yair Morgenstern
parent 6004d49803
commit 383b39c62d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -19,12 +19,11 @@ import java.text.DecimalFormat
import kotlin.math.roundToInt import kotlin.math.roundToInt
class EmpireOverviewScreen(val viewingPlayer:CivilizationInfo) : CameraStageBaseScreen(){ class EmpireOverviewScreen(val viewingPlayer:CivilizationInfo) : CameraStageBaseScreen(){
private val topTable = Table().apply { defaults().pad(10f) }
private val centerTable = Table().apply { defaults().pad(20f) }
init { init {
onBackButtonClicked { UncivGame.Current.setWorldScreen() } onBackButtonClicked { UncivGame.Current.setWorldScreen() }
val topTable = Table().apply { defaults().pad(10f) }
val centerTable=Table().apply { defaults().pad(20f) }
val closeButton = TextButton("Close".tr(), skin) val closeButton = TextButton("Close".tr(), skin)
closeButton.onClick { UncivGame.Current.setWorldScreen() } closeButton.onClick { UncivGame.Current.setWorldScreen() }
@ -100,7 +99,6 @@ class EmpireOverviewScreen(val viewingPlayer:CivilizationInfo) : CameraStageBase
table.add(centerTable).expand().row() table.add(centerTable).expand().row()
table.setFillParent(true) table.setFillParent(true)
stage.addActor(table) stage.addActor(table)
} }
@ -331,7 +329,9 @@ class EmpireOverviewScreen(val viewingPlayer:CivilizationInfo) : CameraStageBase
fun getDiplomacyGroup(): Group { fun getDiplomacyGroup(): Group {
val relevantCivs = viewingPlayer.gameInfo.civilizations.filter { !it.isBarbarian() && !it.isCityState() } val relevantCivs = viewingPlayer.gameInfo.civilizations.filter { !it.isBarbarian() && !it.isCityState() }
val groupSize = 500f val freeWidth = stage.width
val freeHeight = stage.height - topTable.height
val groupSize = if (freeWidth > freeHeight) freeHeight else freeWidth
val group = Group() val group = Group()
group.setSize(groupSize,groupSize) group.setSize(groupSize,groupSize)
val civGroups = HashMap<String, Actor>() val civGroups = HashMap<String, Actor>()