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

Fix Civilopedia content clipped at the top (#11788)

Browse Source
This commit is contained in:
SomeTroglodyte
2024-06-19 16:13:02 +02:00
committed by GitHub
parent 33f73f5aae
commit 2f6c48a0cf
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/ui/images/Portrait.kt
View File

@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.Group
import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.utils.Layout
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.unit.Promotion import com.unciv.models.ruleset.unit.Promotion
@ -16,6 +17,17 @@ import com.unciv.ui.components.extensions.surroundWithCircle
import com.unciv.ui.components.extensions.toGroup import com.unciv.ui.components.extensions.toGroup
import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toLabel
/**
* ### Manages "portraits" for a subset of RulesetObjects
* - A Portrait will be a classic circular Icon in vanilla
* - Mods can supply portraits in separate texture paths that can fill a square
* - Instantiate through [ImageGetter]`.get<type>Portrait()` methods
* - TODO - that's as far as I understand this - @SomeTroglodyte
* ### Caveat
* - This is a Group and does **not** support [Layout].
* - It sets its own [size] but **paints outside these bounds** - by [borderSize].
* - Typically, if you want one in a Table Cell, add an extra [borderSize] padding to avoid surprises.
*/
open class Portrait(val type: Type, val imageName: String, val size: Float, val borderSize: Float = 2f) : Group() { open class Portrait(val type: Type, val imageName: String, val size: Float, val borderSize: Float = 2f) : Group() {
enum class Type(val directory: String) { enum class Type(val directory: String) {

2
core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaScreen.kt
View File

@ -260,7 +260,7 @@ class CivilopediaScreen(
entrySelectTable.top() entrySelectTable.top()
entrySelectScroll.setOverscroll(false, false) entrySelectScroll.setOverscroll(false, false)
val descriptionTable = Table() val descriptionTable = Table()
descriptionTable.add(flavourTable).row() descriptionTable.add(flavourTable).padTop(7f).padBottom(5f).row() // 2f of that 7f is used up by Portrait painting e.g. a Nation's outer border *outside its bounds*
val entrySplitPane = SplitPane(entrySelectScroll, ScrollPane(descriptionTable), false, skin) val entrySplitPane = SplitPane(entrySelectScroll, ScrollPane(descriptionTable), false, skin)
entrySplitPane.splitAmount = 0.3f entrySplitPane.splitAmount = 0.3f
entryTable.addActor(entrySplitPane) entryTable.addActor(entrySplitPane)