mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-06-15 23:23:14 +00:00
move display mode and hdr to graphics tab (#2485)
* move display mode and hdr to graphics tab * add left margin to display settings box * merge display combo box and fullscreen checkbox * remove commented out checkbox * Rename borderless to windowed * rename graphics box and mode * Rename window modes and map * fix formatting * fix: xml formatting * Rename borderless windowed * change resolution input layout * rename resolution to window size * change window size layout oriention * add true fullscreen mode * fix duplicate label name * set fullscreen on true fullscreen or borderless * remove commented out ref * rearrange settings config for new schema * move HDR config to GPU section
This commit is contained in:
parent
e1e697a3ff
commit
bc85357235
4 changed files with 178 additions and 174 deletions
|
@ -34,7 +34,7 @@ namespace Config {
|
|||
static bool isHDRAllowed = false;
|
||||
static bool isNeo = false;
|
||||
static bool isFullscreen = false;
|
||||
static std::string fullscreenMode = "borderless";
|
||||
static std::string fullscreenMode = "Fullscreen (Borderless)";
|
||||
static bool playBGM = false;
|
||||
static bool isTrophyPopupDisabled = false;
|
||||
static int BGMvolume = 50;
|
||||
|
@ -694,10 +694,7 @@ void load(const std::filesystem::path& path) {
|
|||
if (data.contains("General")) {
|
||||
const toml::value& general = data.at("General");
|
||||
|
||||
isHDRAllowed = toml::find_or<bool>(general, "allowHDR", false);
|
||||
isNeo = toml::find_or<bool>(general, "isPS4Pro", false);
|
||||
isFullscreen = toml::find_or<bool>(general, "Fullscreen", false);
|
||||
fullscreenMode = toml::find_or<std::string>(general, "FullscreenMode", "borderless");
|
||||
playBGM = toml::find_or<bool>(general, "playBGM", false);
|
||||
isTrophyPopupDisabled = toml::find_or<bool>(general, "isTrophyPopupDisabled", false);
|
||||
BGMvolume = toml::find_or<int>(general, "BGMvolume", 50);
|
||||
|
@ -742,6 +739,10 @@ void load(const std::filesystem::path& path) {
|
|||
shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", false);
|
||||
shouldPatchShaders = toml::find_or<bool>(gpu, "patchShaders", true);
|
||||
vblankDivider = toml::find_or<int>(gpu, "vblankDivider", 1);
|
||||
isFullscreen = toml::find_or<bool>(gpu, "Fullscreen", false);
|
||||
fullscreenMode =
|
||||
toml::find_or<std::string>(gpu, "FullscreenMode", "Fullscreen (Borderless)");
|
||||
isHDRAllowed = toml::find_or<bool>(gpu, "allowHDR", false);
|
||||
}
|
||||
|
||||
if (data.contains("Vulkan")) {
|
||||
|
@ -844,10 +845,7 @@ void save(const std::filesystem::path& path) {
|
|||
fmt::print("Saving new configuration file {}\n", fmt::UTF(path.u8string()));
|
||||
}
|
||||
|
||||
data["General"]["allowHDR"] = isHDRAllowed;
|
||||
data["General"]["isPS4Pro"] = isNeo;
|
||||
data["General"]["Fullscreen"] = isFullscreen;
|
||||
data["General"]["FullscreenMode"] = fullscreenMode;
|
||||
data["General"]["isTrophyPopupDisabled"] = isTrophyPopupDisabled;
|
||||
data["General"]["playBGM"] = playBGM;
|
||||
data["General"]["BGMvolume"] = BGMvolume;
|
||||
|
@ -877,6 +875,9 @@ void save(const std::filesystem::path& path) {
|
|||
data["GPU"]["dumpShaders"] = shouldDumpShaders;
|
||||
data["GPU"]["patchShaders"] = shouldPatchShaders;
|
||||
data["GPU"]["vblankDivider"] = vblankDivider;
|
||||
data["GPU"]["Fullscreen"] = isFullscreen;
|
||||
data["GPU"]["FullscreenMode"] = fullscreenMode;
|
||||
data["GPU"]["allowHDR"] = isHDRAllowed;
|
||||
data["Vulkan"]["gpuId"] = gpuId;
|
||||
data["Vulkan"]["validation"] = vkValidation;
|
||||
data["Vulkan"]["validation_sync"] = vkValidationSync;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue