Browse Source

UI: Make assignDockToggle an actual function

Allows using it outside of the constructor.
jp9000 6 years ago
parent
commit
412520c5d0
1 changed files with 21 additions and 21 deletions
  1. 21 21
      UI/window-basic-main.cpp

+ 21 - 21
UI/window-basic-main.cpp

@@ -161,6 +161,27 @@ static int CountVideoSources()
 	return count;
 	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)
 OBSBasic::OBSBasic(QWidget *parent)
 	: OBSMainWindow  (parent),
 	: OBSMainWindow  (parent),
 	  ui             (new Ui::OBSBasic)
 	  ui             (new Ui::OBSBasic)
@@ -285,27 +306,6 @@ OBSBasic::OBSBasic(QWidget *parent)
 	addNudge(Qt::Key_Left, SLOT(NudgeLeft()));
 	addNudge(Qt::Key_Left, SLOT(NudgeLeft()));
 	addNudge(Qt::Key_Right, SLOT(NudgeRight()));
 	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->scenesDock, ui->toggleScenes);
 	assignDockToggle(ui->sourcesDock, ui->toggleSources);
 	assignDockToggle(ui->sourcesDock, ui->toggleSources);
 	assignDockToggle(ui->mixerDock, ui->toggleMixer);
 	assignDockToggle(ui->mixerDock, ui->toggleMixer);