jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3332 from WizardCM/log-focus

Browse Source 
UI / Log Viewer: Bring to front rather than close, add minimize/maximize buttons
This commit is contained in:
Jim 2020-08-26 00:06:29 -07:00 committed by GitHub
commit e4e78db7a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/log-viewer.cpp
View File

@ -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);

10
UI/window-basic-main.cpp
View File

@ -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()