AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Overview screen now accessible from top bar

Browse Source
This commit is contained in:
Yair Morgenstern 2018-06-27 20:35:04 +03:00
parent 853f86b613
commit c5787803f9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
View File

@ -4,10 +4,13 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.UnCivGame
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tile.ResourceType import com.unciv.models.gamebasics.tile.ResourceType
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.ui.EmpireOverviewScreen
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.optionstable.WorldScreenOptionsTable import com.unciv.ui.worldscreen.optionstable.WorldScreenOptionsTable
import kotlin.math.abs import kotlin.math.abs
@ -41,10 +44,11 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() {
pack() pack()
addActor(getMenuButton()) // needs to be after pack addActor(getMenuButton()) // needs to be after pack
// val button = TextButton("Overview",CameraStageBaseScreen.skin) val button = TextButton("Overview",CameraStageBaseScreen.skin)
// button.center(this) button.addClickListener { UnCivGame.Current.screen = EmpireOverviewScreen() }
// button.x = screen.stage.width-button.width-10 button.center(this)
// addActor(button) button.x = screen.stage.width-button.width-10
addActor(button)
} }
private fun getResourceTable(): Table { private fun getResourceTable(): Table {

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

@ -14,11 +14,6 @@ class WorldScreenOptionsTable internal constructor() : OptionsTable() {
remove() remove()
} }
// addButton("Overview".tr()){
// UnCivGame.Current.screen = EmpireOverviewScreen()
// remove()
// }
addButton("Load game".tr()){ addButton("Load game".tr()){
UnCivGame.Current.screen = LoadScreen() UnCivGame.Current.screen = LoadScreen()
remove() remove()