From 412520c5d0d6849ef82aeb140dff517a93f09b7f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 6 Feb 2019 13:30:02 -0800 Subject: [PATCH] UI: Make assignDockToggle an actual function Allows using it outside of the constructor. --- UI/window-basic-main.cpp | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 056c76bfe..6cc9da87d 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -161,6 +161,27 @@ static int CountVideoSources() return count; } +void assignDockToggle(QDockWidget *dock, QAction *action) +{ + auto handleWindowToggle = [action] (bool vis) + { + action->blockSignals(true); + action->setChecked(vis); + action->blockSignals(false); + }; + auto handleMenuToggle = [dock] (bool check) + { + dock->blockSignals(true); + dock->setVisible(check); + dock->blockSignals(false); + }; + + dock->connect(dock->toggleViewAction(), &QAction::toggled, + handleWindowToggle); + dock->connect(action, &QAction::toggled, + handleMenuToggle); +} + OBSBasic::OBSBasic(QWidget *parent) : OBSMainWindow (parent), ui (new Ui::OBSBasic) @@ -285,27 +306,6 @@ OBSBasic::OBSBasic(QWidget *parent) addNudge(Qt::Key_Left, SLOT(NudgeLeft())); addNudge(Qt::Key_Right, SLOT(NudgeRight())); - auto assignDockToggle = [] (QDockWidget *dock, QAction *action) - { - auto handleWindowToggle = [action] (bool vis) - { - action->blockSignals(true); - action->setChecked(vis); - action->blockSignals(false); - }; - auto handleMenuToggle = [dock] (bool check) - { - dock->blockSignals(true); - dock->setVisible(check); - dock->blockSignals(false); - }; - - dock->connect(dock->toggleViewAction(), &QAction::toggled, - handleWindowToggle); - dock->connect(action, &QAction::toggled, - handleMenuToggle); - }; - assignDockToggle(ui->scenesDock, ui->toggleScenes); assignDockToggle(ui->sourcesDock, ui->toggleSources); assignDockToggle(ui->mixerDock, ui->toggleMixer);