AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

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 package com.unciv.ui.worldscreen
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.Constants import com.unciv.Constants
import com.unciv.logic.civilization.diplomacy.DiplomacyFlags 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.utils.toLabel
import com.unciv.ui.worldscreen.optionstable.PopupTable import com.unciv.ui.worldscreen.optionstable.PopupTable
import kotlin.math.max import kotlin.math.max
import kotlin.math.min
class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){ class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){
init{ init{
@ -37,7 +39,10 @@ class TradePopup(worldScreen: WorldScreen): PopupTable(worldScreen){
else tradeOffersTable.add() else tradeOffersTable.add()
tradeOffersTable.row() 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() addGoodSizedLabel(translatedNation.tradeRequest).colspan(columns).row()