From 8148c7155601c18f32f188aa12d2cbdfa0d91e3a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 2 Feb 2017 04:17:17 +0100
Subject: [PATCH] Add sublabels

---
 intl/msg_hash_us.h           | 8 ++++++++
 menu/cbs/menu_cbs_sublabel.c | 8 ++++++++
 retroarch.cfg                | 2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index b6109ceb43..626e74a1ee 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -2449,3 +2449,11 @@ MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_FORCE_SRGB_DISABLE,
       "Forcibly disable sRGB FBO support. Some Intel OpenGL drivers on Windows have video problems with sRGB FBO support if this is enabled. Enabling this can work around it."
       )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN,
+      "Start in fullscreen. Can be changed at runtime."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_WINDOWED_FULLSCREEN,
+      "If fullscreen, prefer using a windowed fullscreen mode."
+      )
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 6eee439428..680c77a48b 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -145,6 +145,8 @@ default_sublabel_macro(action_bind_sublabel_video_scale_integer,           MENU_
 default_sublabel_macro(action_bind_sublabel_video_gpu_screenshot,          MENU_ENUM_SUBLABEL_VIDEO_GPU_SCREENSHOT)
 default_sublabel_macro(action_bind_sublabel_video_rotation,                MENU_ENUM_SUBLABEL_VIDEO_ROTATION)
 default_sublabel_macro(action_bind_sublabel_video_force_srgb_enable,       MENU_ENUM_SUBLABEL_VIDEO_FORCE_SRGB_DISABLE)
+default_sublabel_macro(action_bind_sublabel_video_fullscreen,              MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN)
+default_sublabel_macro(action_bind_sublabel_video_windowed_fullscreen,     MENU_ENUM_SUBLABEL_VIDEO_WINDOWED_FULLSCREEN)
 
 static int action_bind_sublabel_cheevos_entry(
       file_list_t *list,
@@ -206,6 +208,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
    {
       switch (cbs->enum_idx)
       {
+         case MENU_ENUM_LABEL_VIDEO_FULLSCREEN:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_fullscreen);
+            break;
+         case MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_windowed_fullscreen);
+            break;
          case MENU_ENUM_LABEL_VIDEO_FORCE_SRGB_DISABLE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_force_srgb_enable);
             break;
diff --git a/retroarch.cfg b/retroarch.cfg
index e921930c8b..4a47b3b4ec 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -239,7 +239,7 @@
 # Do note that the _full_ path of the font is necessary!
 # video_font_path =
 
-# Size of the font rendered.
+# Size of the font rendered in points.
 # video_font_size = 32
 
 # Enable usage of OSD messages.