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

Desktop settings initialize to fullscreen (#7821)

Browse Source
This commit is contained in:
Yair Morgenstern
2022-09-19 16:12:49 +03:00
committed by GitHub
parent d34fd718c9
commit 1256724ee3
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/UncivFiles.kt
View File

@ -13,8 +13,8 @@ import com.unciv.models.metadata.doMigrations
import com.unciv.models.metadata.isMigrationNecessary
import com.unciv.ui.saves.Gzip
import com.unciv.ui.utils.extensions.toNiceString
import com.unciv.utils.concurrency.Concurrency
import com.unciv.utils.Log
import com.unciv.utils.concurrency.Concurrency
import com.unciv.utils.debug
import kotlinx.coroutines.Job
import java.io.File
@ -23,7 +23,7 @@ import java.io.Writer
private const val SAVE_FILES_FOLDER = "SaveFiles"
private const val MULTIPLAYER_FILES_FOLDER = "MultiplayerGames"
private const val AUTOSAVE_FILE_NAME = "Autosave"
private const val SETTINGS_FILE_NAME = "GameSettings.json"
const val SETTINGS_FILE_NAME = "GameSettings.json"
class UncivFiles(
/**

19
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -5,14 +5,19 @@ import club.minnced.discord.rpc.DiscordRPC
import club.minnced.discord.rpc.DiscordRichPresence
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
import com.badlogic.gdx.files.FileHandle
import com.badlogic.gdx.graphics.glutils.HdpiMode
import com.sun.jna.Native
import com.unciv.UncivGame
import com.unciv.UncivGameParameters
import com.unciv.json.json
import com.unciv.logic.SETTINGS_FILE_NAME
import com.unciv.logic.UncivFiles
import com.unciv.models.metadata.WindowState
import com.unciv.ui.utils.Fonts
import com.unciv.utils.Log
import com.unciv.utils.debug
import java.awt.Toolkit
import java.util.*
import kotlin.concurrent.timer
@ -44,10 +49,20 @@ internal object DesktopLauncher {
config.disableAudio(true)
val settings = UncivFiles.getSettingsForPlatformLaunchers()
if (!settings.isFreshlyCreated) {
config.setWindowedMode(settings.windowState.width.coerceAtLeast(120), settings.windowState.height.coerceAtLeast(80))
if (settings.isFreshlyCreated) {
settings.resolution = "1200x800" // By default Desktops should have a higher resolution
// LibGDX not yet configured, use regular java class
val screensize = Toolkit.getDefaultToolkit().screenSize
settings.windowState = WindowState(
width = screensize.width,
height = screensize.height
)
FileHandle(SETTINGS_FILE_NAME).writeString(json().toJson(settings), false) // so when we later open the game we get fullscreen
}
config.setWindowedMode(settings.windowState.width.coerceAtLeast(120), settings.windowState.height.coerceAtLeast(80))
if (!isRunFromJAR) {
UniqueDocsWriter().write()
}