From 52a3a61a6e9a27662ff25a4ab5f39940b1811706 Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Mon, 21 Oct 2019 15:17:26 -0500 Subject: [PATCH] UI: Simplify fullscreen toggle code --- UI/window-basic-main.cpp | 7 +------ UI/window-basic-main.hpp | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 1e4ca2a6b..200a9cb5d 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1758,9 +1758,6 @@ void OBSBasic::OBSInit() SystemTray(true); #endif - if (windowState().testFlag(Qt::WindowFullScreen)) - fullscreenInterface = true; - bool has_last_version = config_has_user_value(App()->GlobalConfig(), "General", "LastVersion"); bool first_run = @@ -6612,12 +6609,10 @@ void OBSBasic::OpenSavedProjectors() void OBSBasic::on_actionFullscreenInterface_triggered() { - if (!fullscreenInterface) + if (!isFullScreen()) showFullScreen(); else showNormal(); - - fullscreenInterface = !fullscreenInterface; } void OBSBasic::UpdateTitleBar() diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 0a0c6208b..bb67cc47b 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -153,7 +153,6 @@ private: long disableSaving = 1; bool projectChanged = false; bool previewEnabled = true; - bool fullscreenInterface = false; const char *copyString; const char *copyFiltersString = nullptr;