diff --git a/core/src/com/unciv/ui/LanguagePickerScreen.kt b/core/src/com/unciv/ui/LanguagePickerScreen.kt index 364b3c70..643d1759 100644 --- a/core/src/com/unciv/ui/LanguagePickerScreen.kt +++ b/core/src/com/unciv/ui/LanguagePickerScreen.kt @@ -17,6 +17,7 @@ class LanguageTable(val language:String, val percentComplete: Int):Table(){ init{ pad(10f) defaults().pad(10f) + left() if(ImageGetter.imageExists("FlagIcons/$language")) add(ImageGetter.getImage("FlagIcons/$language")).size(40f) @@ -52,6 +53,11 @@ class LanguagePickerScreen(): PickerScreen(){ | instructions are in the Github readme! (Menu > Community > Github) """.trimMargin() topTable.add(translationDisclaimer.toLabel()).pad(10f).row() + val tableLanguages = Table(); + tableLanguages.defaults().uniformX(); + tableLanguages.defaults().pad(10.0f); + tableLanguages.defaults().fillX(); + topTable.add(tableLanguages).row(); val languageCompletionPercentage = UncivGame.Current.translations .percentCompleteOfLanguages @@ -65,7 +71,7 @@ class LanguagePickerScreen(): PickerScreen(){ rightSideButton.enable() update() } - topTable.add(it).pad(10f).row() + tableLanguages.add(it).row() } rightSideButton.setText("Pick language".tr()) diff --git a/core/src/com/unciv/ui/MultiplayerScreen.kt b/core/src/com/unciv/ui/MultiplayerScreen.kt index 8764902b..21f28fab 100644 --- a/core/src/com/unciv/ui/MultiplayerScreen.kt +++ b/core/src/com/unciv/ui/MultiplayerScreen.kt @@ -68,6 +68,10 @@ class MultiplayerScreen(previousScreen: CameraStageBaseScreen) : PickerScreen() topTable.add(mainTable).row() scrollPane.setScrollingDisabled(false, true) + rightSideTable.defaults().uniformX(); + rightSideTable.defaults().fillX(); + rightSideTable.defaults().pad(10.0f); + // leftTable Setup reloadGameListUI() @@ -79,30 +83,30 @@ class MultiplayerScreen(previousScreen: CameraStageBaseScreen) : PickerScreen() Gdx.app.clipboard.contents = game.settings.userId ResponsePopup("UserID copied to clipboard".tr(), this) } - rightSideTable.add(copyUserIdButton).pad(10f).padBottom(30f).row() + rightSideTable.add(copyUserIdButton).padBottom(30f).row() copyGameIdButton.onClick { Gdx.app.clipboard.contents = selectedGame.gameId ResponsePopup("GameID copied to clipboard".tr(), this) } - rightSideTable.add(copyGameIdButton).pad(10f).row() + rightSideTable.add(copyGameIdButton).row() editButton.onClick { game.setScreen(EditMultiplayerGameInfoScreen(selectedGame, selectedGameName, this)) //game must be unselected in case the game gets deleted inside the EditScreen unselectGame() } - rightSideTable.add(editButton).pad(10f).row() + rightSideTable.add(editButton).row() addGameButton.onClick { game.setScreen(AddMultiplayerGameScreen(this)) } - rightSideTable.add(addGameButton).pad(10f).padBottom(30f).row() + rightSideTable.add(addGameButton).padBottom(30f).row() refreshButton.onClick { redownloadAllGames() } - rightSideTable.add(refreshButton).pad(10f).row() + rightSideTable.add(refreshButton).row() //RightSideButton Setup rightSideButton.setText("Join Game".tr()) diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt index 48052b3e..e8d1c14e 100644 --- a/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt +++ b/core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt @@ -19,7 +19,7 @@ import com.unciv.ui.utils.AutoScrollPane as ScrollPane class Language(val language:String, val percentComplete:Int){ override fun toString(): String { val spaceSplitLang = language.replace("_"," ") - return "$spaceSplitLang- $percentComplete%" + return "$spaceSplitLang - $percentComplete%" } }