From b8d907f39957a2264f1d0b5a19899140fd17e45d Mon Sep 17 00:00:00 2001
From: cg2121 <claytong1214@gmail.com>
Date: Sat, 4 Mar 2017 08:21:43 -0600
Subject: [PATCH] UI: Add fullscreen UI option to view menu

(Edit by Jim: Removed "Fullscreen Preview" because that's already sort
of served by the normal fullscreen projector option via the preview
context menu)

Closes jp9000/obs-studio#846
---
 UI/data/locale/en-US.ini |  1 +
 UI/forms/OBSBasic.ui     | 10 ++++++++++
 UI/window-basic-main.cpp | 13 +++++++++++++
 UI/window-basic-main.hpp |  3 +++
 4 files changed, 27 insertions(+)

diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
index ab3592148..f7dc4d746 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
@@ -489,6 +489,7 @@ Basic.MainMenu.View.Toolbars="&Toolbars"
 Basic.MainMenu.View.Toolbars.Listboxes="&Listboxes"
 Basic.MainMenu.View.SceneTransitions="S&cene Transitions"
 Basic.MainMenu.View.StatusBar="&Status Bar"
+Basic.MainMenu.View.Fullscreen.Interface="Fullscreen Interface"
 
 # basic mode profile/scene collection menus
 Basic.MainMenu.SceneCollection="&Scene Collection"
diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui
index dd61bde05..53998458a 100644
--- a/UI/forms/OBSBasic.ui
+++ b/UI/forms/OBSBasic.ui
@@ -978,6 +978,16 @@
      </property>
      <addaction name="toggleListboxToolbars"/>
     </widget>
+    <addaction name="actionFullscreenInterface"/>
+    <action name="actionFullscreenInterface">
+     <property name="shortcut">
+      <string>F11</string>
+     </property>
+     <property name="text">
+      <string>Basic.MainMenu.View.Fullscreen.Interface</string>
+     </property>
+    </action>
+    <addaction name="separator"/>
     <addaction name="viewMenuToolbars"/>
     <addaction name="toggleSceneTransitions"/>
     <addaction name="toggleStatusBar"/>
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index d1da52010..e328d4a12 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -1431,6 +1431,9 @@ void OBSBasic::OBSInit()
 
 	OpenSavedProjectors();
 
+	if (windowState().testFlag(Qt::WindowFullScreen))
+		fullscreenInterface = true;
+
 	bool has_last_version = config_has_user_value(App()->GlobalConfig(),
 			"General", "LastVersion");
 	bool first_run = config_get_bool(App()->GlobalConfig(), "General",
@@ -5177,6 +5180,16 @@ void OBSBasic::RemoveSavedProjectors(int monitor)
 	projectorArray.at((size_t)monitor) = "";
 }
 
+void OBSBasic::on_actionFullscreenInterface_triggered()
+{
+	if (!fullscreenInterface)
+		showFullScreen();
+	else
+		showNormal();
+
+	fullscreenInterface = !fullscreenInterface;
+}
+
 void OBSBasic::UpdateTitleBar()
 {
 	stringstream name;
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index 9a4de4030..dc91a64b2 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -119,6 +119,7 @@ private:
 	long disableSaving = 1;
 	bool projectChanged = false;
 	bool previewEnabled = true;
+	bool fullscreenInterface = false;
 
 	const char *copyString;
 	const char *copyFiltersString;
@@ -529,6 +530,8 @@ protected:
 	virtual void changeEvent(QEvent *event) override;
 
 private slots:
+	void on_actionFullscreenInterface_triggered();
+
 	void on_actionShow_Recordings_triggered();
 	void on_actionRemux_triggered();
 	void on_action_Settings_triggered();
-- 
GitLab