From: Soeren Apel <redacted>
Date: Tue, 4 Oct 2016 17:52:56 +0000 (+0200)
Subject: MainWindow: Fix dock nesting
X-Git-Tag: pulseview-0.4.0~235
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=68ad932d712f9a59be529d5283b95617e6da1e28

MainWindow: Fix dock nesting

The nesting flag was applied to the wrong QMainWindow
after the introduction of the tab widget.
---

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 31e9f2f9..a0439623 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -239,6 +239,8 @@ shared_ptr<Session> MainWindow::add_session()
 	session_windows_[session] = window;
 	session_selector_.addTab(window, name);
 
+	window->setDockNestingEnabled(true);
+
 	shared_ptr<views::ViewBase> main_view =
 		add_view(name, views::ViewTypeTrace, *session);
 
@@ -312,8 +314,6 @@ void MainWindow::setup_ui()
 	connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
 		this, SLOT(on_tab_close_requested(int)));
 
-	setDockNestingEnabled(true);
-
 	connect(static_cast<QApplication *>(QCoreApplication::instance()),
 		SIGNAL(focusChanged(QWidget*, QWidget*)),
 		this, SLOT(on_focus_changed()));