mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-06-07 15:25:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Move Docks into top level menu

Browse Source 
Managing the OBS UI docks is a core feature and as such should be
at the top level of the menu
This commit is contained in:
Warchamp7
2021-11-18 22:06:14 -05:00
committed by Jim
parent 0d3ce3dfe6
commit a33c5c6be1
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1966,14 +1966,13 @@ void OBSBasic::OBSInit()
#ifdef BROWSER_AVAILABLE
if (cef) {
QAction *action = new QAction(QTStr("Basic.MainMenu."
"View.Docks."
QAction *action = new QAction(QTStr("Basic.MainMenu.Docks."
"CustomBrowserDocks"),
this);
ui->viewMenuDocks->insertAction(ui->toggleScenes, action);
ui->menuDocks->insertAction(ui->toggleScenes, action);
connect(action, &QAction::triggered, this,
&OBSBasic::ManageExtraBrowserDocks);
ui->viewMenuDocks->insertSeparator(ui->toggleScenes);
ui->menuDocks->insertSeparator(ui->toggleScenes);
LoadExtraBrowserDocks();
}
@@ -9571,7 +9570,7 @@ void OBSBasic::ResizeOutputSizeOfSource()
QAction *OBSBasic::AddDockWidget(QDockWidget *dock)
{
QAction *action = ui->viewMenuDocks->addAction(dock->windowTitle());
QAction *action = ui->menuDocks->addAction(dock->windowTitle());
action->setCheckable(true);
assignDockToggle(dock, action);
extraDocks.push_back(dock);
@@ -9948,7 +9947,7 @@ void OBSBasic::on_customContextMenuRequested(const QPoint &pos)
className = widget->metaObject()->className();
if (!className || strstr(className, "Dock") != nullptr)
ui->viewMenuDocks->exec(mapToGlobal(pos));
ui->menuDocks->exec(mapToGlobal(pos));
}
void OBSBasic::UpdateProjectorHideCursor()