mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 16:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Civilopedia: Init logical order, changed geometry to make better use of screen (#2396)

Browse Source
This commit is contained in:
SomeTroglodyte
2020-04-13 09:41:18 +02:00
committed by GitHub
parent d3d655fe47
commit 9b26ab1385
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
core/src/com/unciv/ui/CivilopediaScreen.kt
View File

@ -35,29 +35,6 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
init { init {
onBackButtonClicked { UncivGame.Current.setWorldScreen() } onBackButtonClicked { UncivGame.Current.setWorldScreen() }
val buttonTable = Table()
buttonTable.pad(15f)
buttonTable.defaults().pad(10f)
val buttonTableScroll = ScrollPane(buttonTable)
val goToGameButton = TextButton("Close".tr(), skin)
goToGameButton.onClick {
game.setWorldScreen()
dispose()
}
val topTable = Table()
topTable.add(goToGameButton).pad(10f)
topTable.add(buttonTableScroll)
val entryTable = Table()
val splitPane = SplitPane(topTable, entryTable, true, skin)
splitPane.splitAmount = 0.2f
splitPane.setFillParent(true)
stage.addActor(splitPane)
description.setWrap(true)
categoryToEntries["Buildings"] = ruleset.buildings.values categoryToEntries["Buildings"] = ruleset.buildings.values
.map { CivilopediaEntry(it.name,it.getDescription(false, null,ruleset), .map { CivilopediaEntry(it.name,it.getDescription(false, null,ruleset),
@ -87,6 +64,10 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
categoryToEntries["Tutorials"] = tutorialController.getCivilopediaTutorials() categoryToEntries["Tutorials"] = tutorialController.getCivilopediaTutorials()
.map { CivilopediaEntry(it.key.replace("_"," "), it.value.joinToString("\n\n") { line -> line.tr() }) } .map { CivilopediaEntry(it.key.replace("_"," "), it.value.joinToString("\n\n") { line -> line.tr() }) }
val buttonTable = Table()
buttonTable.pad(15f)
buttonTable.defaults().pad(10f)
for (category in categoryToEntries.keys) { for (category in categoryToEntries.keys) {
val button = TextButton(category.tr(), skin) val button = TextButton(category.tr(), skin)
button.style = TextButton.TextButtonStyle(button.style) button.style = TextButton.TextButtonStyle(button.style)
@ -94,18 +75,46 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
button.onClick { select(category) } button.onClick { select(category) }
buttonTable.add(button) buttonTable.add(button)
} }
select("Tutorials")
val sp = ScrollPane(entrySelectTable) buttonTable.pack()
sp.setupOverscroll(5f, 1f, 200f) buttonTable.width = stage.width
entryTable.add(sp).width(Value.percentWidth(0.25f, entryTable)).height(Value.percentHeight(0.7f, entryTable)) val buttonTableScroll = ScrollPane(buttonTable)
val goToGameButton = TextButton("Close".tr(), skin)
goToGameButton.onClick {
game.setWorldScreen()
dispose()
}
val topTable = Table()
topTable.add(goToGameButton).pad(10f)
topTable.add(buttonTableScroll)
topTable.pack()
//buttonTable.height = topTable.height
val entryTable = Table()
val splitPane = SplitPane(topTable, entryTable, true, skin)
splitPane.splitAmount = topTable.prefHeight / stage.height
entryTable.height = stage.height - topTable.prefHeight
splitPane.setFillParent(true)
stage.addActor(splitPane)
description.setWrap(true)
val entrySelectScroll = ScrollPane(entrySelectTable)
entrySelectScroll.setupOverscroll(5f, 1f, 200f)
entryTable.add(entrySelectScroll)
.width(Value.percentWidth(0.25f, entryTable))
.fillY()
.pad(Value.percentWidth(0.02f, entryTable)) .pad(Value.percentWidth(0.02f, entryTable))
entryTable.add(ScrollPane(description)).colspan(4) entryTable.add(ScrollPane(description)).colspan(4)
.width(Value.percentWidth(0.65f, entryTable)) .width(Value.percentWidth(0.65f, entryTable))
.height(Value.percentHeight(0.7f, entryTable)) .fillY()
.pad(Value.percentWidth(0.02f, entryTable)) .pad(Value.percentWidth(0.02f, entryTable))
// Simply changing these to x*width, y*height won't work // Simply changing these to x*width, y*height won't work
buttonTable.width = stage.width select("Tutorials")
} }
} }