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

Hopefully resolved ANRs from WorldScreen updates

Browse Source
This commit is contained in:
Yair Morgenstern
2022-10-13 21:18:34 +03:00
parent 95205893b7
commit f3b4db9d64
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.scenes.scene2d.actions.RepeatAction import com.badlogic.gdx.scenes.scene2d.actions.RepeatAction
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.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.scenes.scene2d.ui.TextField
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.Constants import com.unciv.Constants
import com.unciv.MainMenuScreen import com.unciv.MainMenuScreen
@ -75,7 +76,6 @@ import com.unciv.utils.concurrency.withGLContext
import com.unciv.utils.debug import com.unciv.utils.debug
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import com.badlogic.gdx.scenes.scene2d.ui.TextField
/** /**
* Do not create this screen without seriously thinking about the implications: this is the single most memory-intensive class in the application. * Do not create this screen without seriously thinking about the implications: this is the single most memory-intensive class in the application.
@ -785,8 +785,11 @@ class WorldScreen(
if (shouldUpdate) { if (shouldUpdate) {
shouldUpdate = false shouldUpdate = false
// Since updating the worldscreen can take a long time, *especially* the first time, we disable input processing to avoid ANRs
Gdx.input.inputProcessor = null
update() update()
showTutorialsOnNextTurn() showTutorialsOnNextTurn()
Gdx.input.inputProcessor = stage
} }
// topBar.selectedCivLabel.setText(Gdx.graphics.framesPerSecond) // for framerate testing // topBar.selectedCivLabel.setText(Gdx.graphics.framesPerSecond) // for framerate testing

5
docs/Modders/uniques.md
View File

@ -1724,11 +1724,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Conditional Applicable to: Conditional
??? example "<upon discovering [tech]>"
Example: "<upon discovering [Agriculture]>"
Applicable to: Conditional
??? example "<after adopting [policy]>" ??? example "<after adopting [policy]>"
Example: "<after adopting [Oligarchy]>" Example: "<after adopting [Oligarchy]>"