summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-03-22 03:57:31 +0100
committerGitHub <noreply@github.com>2017-03-22 03:57:31 +0100
commitccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c (patch)
tree38120c3cf4e7af72dc8122f9f278b77aa52b663b /src/citra
parentRemoved a linebreak from the README. (diff)
parentAdd custom layout settings. (diff)
downloadyuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar
yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.gz
yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.bz2
yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.lz
yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.xz
yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.tar.zst
yuzu-ccc3985cc0efe520bf4f53d4fcac7bfe1abdc82c.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/config.cpp17
-rw-r--r--src/citra/default_ini.h15
2 files changed, 32 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index ef1229912..a4162e9ad 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -94,6 +94,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 af9f7aa2a..084372df4 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -84,6 +84,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 =