wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #1185 (hopefully): Made trade requests in offer popup, scrollable

Browse source
This commit is contained in:
Yair Morgenstern 2019-10-12 22:44:28 +03:00
parent b661308a9d
commit 16d565a1f2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/com/unciv/ui/worldscreen/TradePopup.kt
View file

@ -1,6 +1,7 @@
package com.unciv.ui.worldscreen
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.Constants
import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
@ -12,6 +13,7 @@ import com.unciv.ui.utils.addSeparator
import com.unciv.ui.utils.toLabel
import com.unciv.ui.worldscreen.optionstable.PopupTable
import kotlin.math.max
import kotlin.math.min
class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){
init{
@ -37,7 +39,10 @@ class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){
else tradeOffersTable.add()
tradeOffersTable.row()
}
add(tradeOffersTable).row()
tradeOffersTable.pack()
val scrollHeight = min(tradeOffersTable.height, worldScreen.stage.height/2)
add(ScrollPane(tradeOffersTable)).height(scrollHeight).row()
addGoodSizedLabel(translatedNation.tradeRequest).colspan(columns).row()