TechPickerScreen centers small tech trees nicely

core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt

@@ -4,6 +4,7 @@ import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.math.Vector2
 import com.badlogic.gdx.scenes.scene2d.ui.Image
+import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.logic.civilization.CivilizationInfo
@@ -24,6 +25,15 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
     private var tempTechsToResearch: ArrayList<String>
     private var lines = ArrayList<Image>()
 
+    /** We need this to be a separate table, and NOT the topTable, because *inhales*
+     * When call setConnectingLines we need to pack() the table so that the lines will align correctly, BUT
+     *  this causes the table to be SMALLER THAN THE SCREEN for small tech trees e.g. scenarios,
+     *  meaning the tech tree is in a crumpled heap at the lower-left corner of the screen
+     * Having this be a separate table allows us to leave the TopTable as is (that is: auto-width to fit the scrollPane)
+     *  leaving us the juicy small tech tree right in the center.
+     */
+    private val techTable = Table()
+
     // All these are to counter performance problems when updating buttons for all techs.
     private var researchableTechs = civInfo.gameInfo.ruleSet.technologies.keys
             .filter { civTech.canBeResearched(it) }.toHashSet()
@@ -48,8 +58,9 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
         tempTechsToResearch = ArrayList(civTech.techsToResearch)
 
         createTechTable()
-
         setButtonsInfo()
+        topTable.add(techTable)
+
         rightSideButton.setText("Pick a tech".tr())
         rightSideButton.onClick(UncivSound.Paper) {
             game.settings.addCompletedTutorialTask("Pick technology")
@@ -77,7 +88,6 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
             if (firstAvailableTech != null)
                 centerOnTechnology(firstAvailableTech)
         }
-
     }
 
     private fun createTechTable() {
@@ -93,23 +103,23 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
         for ((i, eraName) in erasName.withIndex()) {
             val columnSpan = if (eraName != Constants.ancientEra && eraName != Constants.futureEra) 2 else 3
             val color = if (i % 2 == 0) Color.BLUE else Color.FIREBRICK
-            topTable.add(eraName.toLabel().addBorder(2f, color)).fill().colspan(columnSpan)
+            techTable.add(eraName.toLabel().addBorder(2f, color)).fill().colspan(columnSpan)
         }
 
         for (i in 0..9) {
-            topTable.row().pad(5f).padRight(40f)
+            techTable.row().pad(5f).padRight(40f)
 
             for (j in techMatrix.indices) {
                 val tech = techMatrix[j][i]
                 if (tech == null)
-                    topTable.add() // empty cell
+                    techTable.add() // empty cell
 
                 else {
                     val techButton = TechButton(tech.name, civTech, false)
 
                     techNameToButton[tech.name] = techButton
                     techButton.onClick { selectTechnology(tech, false) }
-                    topTable.add(techButton)
+                    techTable.add(techButton)
                 }
             }
         }
@@ -143,12 +153,13 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
             techButton.text.setText(text)
         }
 
-
         addConnectingLines()
     }
 
     private fun addConnectingLines() {
-        topTable.pack() // Needed for the lines to work!
+        techTable.pack() // required for the table to have the button positions set, so topTable.stageToLocalCoordinates will be correct
+        scrollPane.updateVisualScroll()
+
         for (line in lines) line.remove()
         lines.clear()
 
@@ -160,11 +171,11 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
                 val prerequisiteButton = techNameToButton[prerequisite]!!
                 val techButtonCoords = Vector2(0f, techButton.height / 2)
                 techButton.localToStageCoordinates(techButtonCoords)
-                topTable.stageToLocalCoordinates(techButtonCoords)
+                techTable.stageToLocalCoordinates(techButtonCoords)
 
                 val prerequisiteCoords = Vector2(prerequisiteButton.width, prerequisiteButton.height / 2)
                 prerequisiteButton.localToStageCoordinates(prerequisiteCoords)
-                topTable.stageToLocalCoordinates(prerequisiteCoords)
+                techTable.stageToLocalCoordinates(prerequisiteCoords)
 
                 val line = ImageGetter.getLine(techButtonCoords.x, techButtonCoords.y,
                         prerequisiteCoords.x, prerequisiteCoords.y, 2f)
@@ -176,7 +187,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
                 }
                 line.color = lineColor
 
-                topTable.addActor(line)
+                techTable.addActor(line)
                 lines.add(line)
             }
         }
@@ -195,9 +206,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
             return
 
         // center on technology
-        if (center) {
+        if (center) centerOnTechnology(tech)
-            centerOnTechnology(tech)
-        }
 
         if (isFreeTechPick) {
             selectTechnologyForFreeTech(tech)