From a4e1049e678fae39a9364c3b856c93be3489f342 Mon Sep 17 00:00:00 2001
From: Matt Gajownik <matt@obsproject.com>
Date: Tue, 25 Aug 2020 14:30:21 +1000
Subject: [PATCH] UI: Add maximize and minimize support to Log Viewer

---
 UI/log-viewer.cpp        | 3 ++-
 UI/window-basic-main.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/UI/log-viewer.cpp b/UI/log-viewer.cpp
index 92226355a..f95cb0265 100644
--- a/UI/log-viewer.cpp
+++ b/UI/log-viewer.cpp
@@ -14,7 +14,8 @@
 
 OBSLogViewer::OBSLogViewer(QWidget *parent) : QDialog(parent)
 {
-	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+	setWindowFlags(windowFlags() & Qt::WindowMaximizeButtonHint &
+		       ~Qt::WindowContextHelpButtonHint);
 
 	QVBoxLayout *layout = new QVBoxLayout();
 	layout->setContentsMargins(0, 0, 0, 0);
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 3a9539dbe..07b1b87a9 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -5302,6 +5302,9 @@ void OBSBasic::on_actionViewCurrentLog_triggered()
 	if (!logView->isVisible()) {
 		logView->setVisible(true);
 	} else {
+		logView->setWindowState(logView->windowState() &
+						~Qt::WindowMinimized |
+					Qt::WindowActive);
 		logView->activateWindow();
 		logView->raise();
 	}