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

Fix PolicyScreen branches positioning (#8238) (#8258)

Browse Source 
* Fix PolicyScreen branches positioning (#8238)

* Fix PolicyScreen branches positioning (#8238)

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95 2022-12-29 12:54:13 +01:00 committed by GitHub
parent a751c8e3dc
commit d4ec1852d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
View File

@ -211,7 +211,6 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: CivilizationInfo
val branches = viewingCiv.gameInfo.ruleSet.policyBranches
var rowChangeCount = Int.MAX_VALUE
var rowChangeWidth = Float.MAX_VALUE
// estimate how many branch boxes fit using average size (including pad)
// TODO If we'd want to use scene2d correctly, this is supposed to happen inside an overridden layout() method
@ -219,36 +218,32 @@ class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: CivilizationInfo
// Landscape - arrange in as few rows as looks nice
if (numBranchesY > 1.5f) {
val numRows = if (numBranchesY < 2.9f) 2 else (numBranchesY + 0.1f).toInt()
rowChangeCount = (branches.size + numRows - 1) / numRows
rowChangeCount = (branches.size + numRows - 1) / numRows
}
// Actually create and distribute the policy branches
var wrapper = Table()
var wrapperWidth = 0f // Either pack() each round or cumulate separately
val size = ((branches.size / rowChangeCount) + if (branches.size % rowChangeCount == 0) 0 else 1)*rowChangeCount
for (i in 0 until size) {
var leftToRight = true
var index = 0
var switchOnIndex = rowChangeCount
while (index < branches.size) {
val branch = branches.values.elementAt(index)
val branchGroup = getBranchGroup(branch)
wrapperWidth += branchGroup.width + 20f // 20 is the horizontal padding in wrapper.add
val change = (i % rowChangeCount == 0)
val rightToLeft = ((i / rowChangeCount) % 2)
val r = (i % rowChangeCount) + (i / rowChangeCount)*(rowChangeCount-rightToLeft) + rightToLeft*(rowChangeCount-2*(i % rowChangeCount))
if (index > 0 && index == switchOnIndex || wrapperWidth > rowChangeWidth) {
index += rowChangeCount - if (leftToRight) 1 else - 2
switchOnIndex -= if (leftToRight) 1 else rowChangeCount - 2
leftToRight = !leftToRight
if (i > 0 && change) {
topTable.add(wrapper).pad(5f,10f)
topTable.addSeparator().pad(0f, 10f)
wrapper = Table()
wrapperWidth = 0f
continue
}
wrapper.add(branchGroup).growY().growX()
index += if (leftToRight) 1 else -1
if (r >= branches.size) {
wrapper.add().expand()
} else {
val branch = branches.values.elementAt(r)
val branchGroup = getBranchGroup(branch)
wrapper.add(branchGroup).growY().growX()
}
}
topTable.add(wrapper).pad(5f,10f)