浏览代码

UI: Add maximize and minimize support to Log Viewer

Matt Gajownik 5 年之前
父节点
当前提交
a4e1049e67
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 2 1
      UI/log-viewer.cpp
  2. 3 0
      UI/window-basic-main.cpp

+ 2 - 1
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);

+ 3 - 0
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();
 	}