mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-30 14:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

We now auto-detect resolution from the screen! Been a long time coming!

Browse Source
This commit is contained in:
Yair Morgenstern
2019-12-08 15:28:53 +02:00
parent 34bd8155ae
commit 7d458207b5
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -8,7 +8,6 @@ class GameSettings {
var checkForDueUnits: Boolean = true
var singleTapMove: Boolean = false
var language: String = "English"
var resolution: String = "1050x700"
var tutorialsShown = ArrayList<String>()
var hasCrashedRecently = false
var soundEffectsVolume = 0.5f

3
core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
View File

@ -22,8 +22,7 @@ open class CameraStageBaseScreen : Screen {
var hasPopupOpen = false
init {
val resolutions: List<Float> = game.settings.resolution.split("x").map { it.toInt().toFloat() }
stage = Stage(ExtendViewport(resolutions[0], resolutions[1]), batch)// FitViewport(1000,600)
stage = Stage(ExtendViewport(Gdx.graphics.width.toFloat(), Gdx.graphics.height.toFloat()), batch)// FitViewport(1000,600)
}

22
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
View File

@ -112,8 +112,6 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr
addLanguageSelectBox(innerTable)
addResolutionSelectBox(innerTable)
addAutosaveTurnsSelectBox(innerTable)
addTileSetSelectBox(innerTable)
@ -196,26 +194,6 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr
}
}
private fun addResolutionSelectBox(innerTable: PopupTable) {
innerTable.add("Resolution".toLabel())
val resolutionSelectBox = SelectBox<String>(skin)
val resolutionArray = Array<String>()
resolutionArray.addAll("750x500","900x600", "1050x700", "1200x800", "1500x1000")
resolutionSelectBox.items = resolutionArray
resolutionSelectBox.selected = UncivGame.Current.settings.resolution
innerTable.add(resolutionSelectBox).pad(10f).row()
resolutionSelectBox.addListener(object : ChangeListener() {
override fun changed(event: ChangeEvent?, actor: Actor?) {
UncivGame.Current.settings.resolution = resolutionSelectBox.selected
UncivGame.Current.settings.save()
UncivGame.Current.worldScreen = WorldScreen(worldScreen.viewingCiv)
UncivGame.Current.setWorldScreen()
WorldScreenOptionsTable(UncivGame.Current.worldScreen)
}
})
}
private fun addTileSetSelectBox(innerTable: PopupTable) {
innerTable.add("Tileset".toLabel())