Просмотр исходного кода

Merge pull request #3332 from WizardCM/log-focus

UI / Log Viewer: Bring to front rather than close, add minimize/maximize buttons
Jim 5 лет назад
Родитель
Сommit
e4e78db7a8
2 измененных файлов с 11 добавлено и 2 удалено
  1. 2 1
      UI/log-viewer.cpp
  2. 9 1
      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);

+ 9 - 1
UI/window-basic-main.cpp

@@ -5318,7 +5318,15 @@ void OBSBasic::on_actionUploadLastLog_triggered()
 
 void OBSBasic::on_actionViewCurrentLog_triggered()
 {
-	logView->setVisible(!logView->isVisible());
+	if (!logView->isVisible()) {
+		logView->setVisible(true);
+	} else {
+		logView->setWindowState(logView->windowState() &
+						~Qt::WindowMinimized |
+					Qt::WindowActive);
+		logView->activateWindow();
+		logView->raise();
+	}
 }
 
 void OBSBasic::on_actionShowCrashLogs_triggered()