From 68ad932d712f9a59be529d5283b95617e6da1e28 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Tue, 4 Oct 2016 19:52:56 +0200 Subject: [PATCH] MainWindow: Fix dock nesting The nesting flag was applied to the wrong QMainWindow after the introduction of the tab widget. --- pv/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 MainWindow::add_session() session_windows_[session] = window; session_selector_.addTab(window, name); + window->setDockNestingEnabled(true); + shared_ptr 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(QCoreApplication::instance()), SIGNAL(focusChanged(QWidget*, QWidget*)), this, SLOT(on_focus_changed())); -- 2.30.2