diff options
| author | SonofUgly <son_of_ugly@yahoo.com> | 2017-02-01 09:22:47 +0100 |
|---|---|---|
| committer | SonofUgly <son_of_ugly@yahoo.com> | 2017-02-23 19:49:56 +0100 |
| commit | e0a4450bbd40d69d288023ab5a95eaa0b00100fd (patch) | |
| tree | 288cacc8a345cea50d8c6a25c17e4ebbb1ec41d9 /src/citra | |
| parent | Merge pull request #2485 from Kloen/killing-warnings-computehash64 (diff) | |
| download | yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.tar yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.tar.gz yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.tar.bz2 yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.tar.lz yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.tar.xz yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.tar.zst yuzu-e0a4450bbd40d69d288023ab5a95eaa0b00100fd.zip | |
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/config.cpp | 17 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 15 |
2 files changed, 32 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 827c90e55..2314e3f95 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -77,6 +77,23 @@ void Config::ReadValues() { Settings::values.layout_option = static_cast<Settings::LayoutOption>(sdl2_config->GetInteger("Layout", "layout_option", 0)); Settings::values.swap_screen = sdl2_config->GetBoolean("Layout", "swap_screen", false); + Settings::values.custom_layout = sdl2_config->GetBoolean("Layout", "custom_layout", false); + Settings::values.custom_top_left = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_top_left", 0)); + Settings::values.custom_top_top = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_top_top", 0)); + Settings::values.custom_top_right = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_top_right", 400)); + Settings::values.custom_top_bottom = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_top_bottom", 240)); + Settings::values.custom_bottom_left = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_bottom_left", 40)); + Settings::values.custom_bottom_top = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_bottom_top", 240)); + Settings::values.custom_bottom_right = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_bottom_right", 360)); + Settings::values.custom_bottom_bottom = + static_cast<u16>(sdl2_config->GetInteger("Layout", "custom_bottom_bottom", 480)); // Audio Settings::values.sink_id = sdl2_config->Get("Audio", "output_engine", "auto"); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index d728fb9e8..fd9a9273a 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -71,6 +71,21 @@ bg_green = # 0 (default): Default Top Bottom Screen, 1: Single Screen Only, 2: Large Screen Small Screen layout_option = +# Toggle custom layout (using the settings below) on or off. +# 0 (default): Off , 1: On +custom_layout = + +# Screen placement when using Custom layout option +# 0x, 0y is the top left corner of the render window. +custom_top_left = +custom_top_top = +custom_top_right = +custom_top_bottom = +custom_bottom_left = +custom_bottom_top = +custom_bottom_right = +custom_bottom_bottom = + #Whether to toggle frame limiter on or off. # 0: Off , 1 (default): On toggle_framelimit = |