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

Resolved #9146 - crash screen '

Browse Source 
copy to clipboard' no longer causes crashes itself
This commit is contained in:
Yair Morgenstern 2023-04-09 17:23:22 +03:00
parent 338c4bd7e4
commit a691066b05
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/com/unciv/ui/crashhandling/CrashScreen.kt
View File

@ -11,7 +11,6 @@ import com.unciv.UncivGame
import com.unciv.logic.files.UncivFiles import com.unciv.logic.files.UncivFiles
import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.RulesetCache
import com.unciv.ui.components.AutoScrollPane import com.unciv.ui.components.AutoScrollPane
import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.components.extensions.addBorder import com.unciv.ui.components.extensions.addBorder
import com.unciv.ui.components.extensions.onClick import com.unciv.ui.components.extensions.onClick
import com.unciv.ui.components.extensions.setFontSize import com.unciv.ui.components.extensions.setFontSize
@ -19,6 +18,7 @@ import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.IconTextButton
import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.ToastPopup import com.unciv.ui.popups.ToastPopup
import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.utils.Log import com.unciv.utils.Log
import java.io.PrintWriter import java.io.PrintWriter
import java.io.StringWriter import java.io.StringWriter
@ -161,12 +161,19 @@ class CrashScreen(val exception: Throwable): BaseScreen() {
private fun makeActionButtonsTable(): Table { private fun makeActionButtonsTable(): Table {
val copyButton = IconTextButton("Copy", fontSize = Constants.headingFontSize) val copyButton = IconTextButton("Copy", fontSize = Constants.headingFontSize)
.onClick { .onClick {
Gdx.app.clipboard.contents = text try {
copied = true Gdx.app.clipboard.contents = text
ToastPopup( copied = true
"Error report copied.", ToastPopup(
this@CrashScreen "Error report copied.",
) this@CrashScreen
)
} catch(ex:Exception) {
ToastPopup(
"Could not copy to clipboard!",
this@CrashScreen
)
}
} }
val reportButton = IconTextButton("Open Issue Tracker", ImageGetter.getImage("OtherIcons/Link"), val reportButton = IconTextButton("Open Issue Tracker", ImageGetter.getImage("OtherIcons/Link"),
Constants.headingFontSize Constants.headingFontSize