mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-04 16:11:46 +07:00
Code Issues Packages Projects Releases Wiki Activity

Keyboard navigation to switch panes within overview screen (#3822)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-04-28 20:40:15 +02:00 committed by GitHub
parent 5b7170bf9f
commit 66f07347e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,8 @@ class GameSettings {
var showExperimentalWorldWrap = false
var showExperimentalTileLayering = false
var lastOverviewPage: String = "Cities"
init {
// 26 = Android Oreo. Versions below may display permanent icon in notification bar.
if (Gdx.app?.type == Application.ApplicationType.Android && Gdx.app.version < 26) {
@ -60,4 +62,4 @@ class GameSettings {
tutorialTasksCompleted.add(tutorialTask)
save()
}
}
}

15
core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt
View File

@ -26,7 +26,7 @@ import kotlin.math.abs
import kotlin.math.roundToInt
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPage: String = "Cities") : CameraStageBaseScreen(){
class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPage: String = "") : CameraStageBaseScreen(){
private val topTable = Table().apply { defaults().pad(10f) }
private val centerTable = Table().apply { defaults().pad(5f) }
@ -42,15 +42,24 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
centerTable.pack()
for ((key, categoryButton) in categoryButtons.filterNot { it.value.touchable == Touchable.disabled })
categoryButton.color = if (key == name) Color.BLUE else Color.WHITE
game.settings.lastOverviewPage = name
}
setCategoryActions[name] = setCategoryAction
categoryButtons[name] = button
button.onClick(setCategoryAction)
if (disabled) button.disable()
else keyPressDispatcher[name[0].toLowerCase()] = setCategoryAction
topTable.add(button)
}
init {
val page =
if (defaultPage != "") {
game.settings.lastOverviewPage = defaultPage
defaultPage
}
else game.settings.lastOverviewPage
onBackButtonClicked { game.setWorldScreen() }
addCategory("Cities", CityOverviewTable(viewingPlayer, this))
@ -69,7 +78,7 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
topTable.pack()
setCategoryActions[defaultPage]?.invoke()
setCategoryActions[page]?.invoke()
val table = Table()
table.add(topTable).row()
@ -572,4 +581,4 @@ class DiplomacyGroup(val viewingPlayer: CivilizationInfo, freeHeight: Float, inc
statusLine.toBack()
}
}
}
}