mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-21 21:30:20 +07:00
Merge branch 'master' of https://github.com/yairm210/Unciv
This commit is contained in:
@ -52,10 +52,13 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe
|
|||||||
topTable.add(ScrollPane(newGameOptionsTable, skin).apply { setOverscroll(false, false) })
|
topTable.add(ScrollPane(newGameOptionsTable, skin).apply { setOverscroll(false, false) })
|
||||||
.maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top()
|
.maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top()
|
||||||
topTable.addSeparatorVertical()
|
topTable.addSeparatorVertical()
|
||||||
topTable.add(ScrollPane(mapOptionsTable).apply { setOverscroll(false, false) })
|
topTable.add(ScrollPane(mapOptionsTable, skin).apply { setOverscroll(false, false) })
|
||||||
.maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top()
|
.maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top()
|
||||||
topTable.addSeparatorVertical()
|
topTable.addSeparatorVertical()
|
||||||
topTable.add(playerPickerTable).maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top()
|
topTable.add(ScrollPane(playerPickerTable, skin)
|
||||||
|
.apply { setOverscroll(false, false) }
|
||||||
|
.apply { setScrollingDisabled(true, false) })
|
||||||
|
.maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top()
|
||||||
|
|
||||||
topTable.pack()
|
topTable.pack()
|
||||||
topTable.setFillParent(true)
|
topTable.setFillParent(true)
|
||||||
|
Reference in New Issue
Block a user