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

Cannot open multiple gold selection popups in trade table

Browse Source
This commit is contained in:
Yair Morgenstern 2020-09-28 23:06:46 +03:00
parent fa5d2b6f49
commit 30396239c1
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
core/src/com/unciv/ui/trade/OfferColumnsTable.kt
View File

@ -65,34 +65,42 @@ class OfferColumnsTable(val tradeLogic: TradeLogic, val screen: DiplomacyScreen,
} }
class goldSelectionPopup(screen: DiplomacyScreen, offer: TradeOffer, ourOffers: TradeOffersList,
offeringCiv: CivilizationInfo, onChange: () -> Unit):Popup(screen){
init {
val existingGoldOffer = ourOffers.firstOrNull { it.type == TradeType.Gold }
if (existingGoldOffer != null)
offer.amount = existingGoldOffer.amount
val amountLabel = offer.amount.toLabel()
val minitable = Table().apply { defaults().pad(5f) }
fun incrementAmount(delta: Int) {
offer.amount += delta
if (offer.amount < 0) offer.amount = 0
if (offer.amount > offeringCiv.gold) offer.amount = offeringCiv.gold
amountLabel.setText(offer.amount)
}
minitable.add("-500".toTextButton().onClick { incrementAmount(-500) })
minitable.add("-50".toTextButton().onClick { incrementAmount(-50) })
minitable.add(amountLabel)
minitable.add("+50".toTextButton().onClick { incrementAmount(50) })
minitable.add("+500".toTextButton().onClick { incrementAmount(500) })
add(minitable).row()
addCloseButton {
if (existingGoldOffer == null)
ourOffers.add(offer)
else existingGoldOffer.amount = offer.amount
onChange()
}
}
}
fun openGoldSelectionPopup(offer: TradeOffer, ourOffers: TradeOffersList, offeringCiv: CivilizationInfo) { fun openGoldSelectionPopup(offer: TradeOffer, ourOffers: TradeOffersList, offeringCiv: CivilizationInfo) {
val selectionPopup = Popup(screen) if (screen.stage.actors.any { it is goldSelectionPopup }) return
val existingGoldOffer = ourOffers.firstOrNull { it.type == TradeType.Gold } val selectionPopup = goldSelectionPopup(screen, offer, ourOffers, offeringCiv, onChange)
if (existingGoldOffer != null)
offer.amount = existingGoldOffer.amount
val amountLabel = offer.amount.toLabel()
val minitable = Table().apply { defaults().pad(5f) }
fun incrementAmount(delta: Int) {
offer.amount += delta
if (offer.amount < 0) offer.amount = 0
if (offer.amount > offeringCiv.gold) offer.amount = offeringCiv.gold
amountLabel.setText(offer.amount)
}
minitable.add("-500".toTextButton().onClick { incrementAmount(-500) })
minitable.add("-50".toTextButton().onClick { incrementAmount(-50) })
minitable.add(amountLabel)
minitable.add("+50".toTextButton().onClick { incrementAmount(50) })
minitable.add("+500".toTextButton().onClick { incrementAmount(500) })
selectionPopup.add(minitable).row()
selectionPopup.addCloseButton {
if (existingGoldOffer == null)
ourOffers.add(offer)
else existingGoldOffer.amount = offer.amount
onChange()
}
selectionPopup.open() selectionPopup.open()
} }