Update trade UI. (#8185)

* delete unnecessary icon space. * replace table fixed size with preferred size.
yairm210 · Dec 19, 2022 · e159b40 · e159b40
1 parent 1f284fe
commit e159b40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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()
                 }