From e159b400b15bc57cf0bd012abf788fbf948c0ccd Mon Sep 17 00:00:00 2001 From: nacro711072 Date: Mon, 19 Dec 2022 22:11:11 +0800 Subject: [PATCH] Update trade UI. (#8185) * delete unnecessary icon space. * replace table fixed size with preferred size. --- core/src/com/unciv/ui/trade/OfferColumnsTable.kt | 4 ++-- core/src/com/unciv/ui/trade/OffersListScroll.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/trade/OfferColumnsTable.kt b/core/src/com/unciv/ui/trade/OfferColumnsTable.kt index 93f461ec67..8dfa02a6c0 100644 --- a/core/src/com/unciv/ui/trade/OfferColumnsTable.kt +++ b/core/src/com/unciv/ui/trade/OfferColumnsTable.kt @@ -59,8 +59,8 @@ class OfferColumnsTable(private val tradeLogic: TradeLogic, val screen: Diplomac add("Our items".tr()) add("[${tradeLogic.otherCivilization.civName}]'s items".tr()).row() - add(ourAvailableOffersTable).size(columnWidth, screen.stage.height / 2) - add(theirAvailableOffersTable).size(columnWidth, screen.stage.height / 2).row() + add(ourAvailableOffersTable).prefSize(columnWidth, screen.stage.height / 2) + add(theirAvailableOffersTable).prefSize(columnWidth, screen.stage.height / 2).row() addSeparator().height(2f) diff --git a/core/src/com/unciv/ui/trade/OffersListScroll.kt b/core/src/com/unciv/ui/trade/OffersListScroll.kt index 14861e62ab..c0af8f3648 100644 --- a/core/src/com/unciv/ui/trade/OffersListScroll.kt +++ b/core/src/com/unciv/ui/trade/OffersListScroll.kt @@ -96,7 +96,8 @@ class OffersListScroll( else -> null } val tradeButton = IconTextButton(tradeLabel, tradeIcon).apply { - iconCell?.size(30f) + if (tradeIcon != null) + iconCell.size(30f) label.setAlignment(Align.center) labelCell.pad(5f).grow() }