diff --git a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp index e404bc9331..a2db50265a 100644 --- a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp +++ b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp @@ -368,7 +368,7 @@ QAction* RiuDockWidgetTools::toggleActionForWidget( const ads::CDockManager* doc //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuDockWidgetTools::setDockLayout( RiuMainWindowBase* mainWindow, const QString& layoutName ) +void RiuDockWidgetTools::setDockLayout( RiuMainWindowBase* mainWindow, const QString& layoutName, bool userLayout ) { if ( mainWindow == nullptr ) return; @@ -380,8 +380,17 @@ void RiuDockWidgetTools::setDockLayout( RiuMainWindowBase* mainWindow, const QSt if ( auto dm = mainWindow->dockManager() ) { - QByteArray state = RiuDockWidgetTools::defaultDockState( layoutName ); - if ( dm->restoreState( state, RiuMainWindowBase::DOCKSTATE_VERSION ) ) + bool loadOk = false; + if ( userLayout ) + { + loadOk = dm->openPerspective( layoutName ); + } + else + { + QByteArray state = RiuDockWidgetTools::defaultDockState( layoutName ); + loadOk = dm->restoreState( state, RiuMainWindowBase::DOCKSTATE_VERSION ); + } + if ( loadOk ) { for ( auto view : mainWindow->viewWindows() ) { diff --git a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h index 674cd37f7d..07fd928a0f 100644 --- a/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h +++ b/ApplicationLibCode/UserInterface/RiuDockWidgetTools.h @@ -93,7 +93,7 @@ public: static QString dockStateHideAllPlotWindowName(); static QString dockStateHideAll3DWindowName(); - static void setDockLayout( RiuMainWindowBase* mainWindow, const QString& layoutName ); + static void setDockLayout( RiuMainWindowBase* mainWindow, const QString& layoutName, bool userLayout = false ); static QAction* toggleActionForWidget( const ads::CDockManager* dockManager, const QString& dockWidgetName ); diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp index a158a080e2..d4cc6f33de 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp +++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp @@ -694,13 +694,13 @@ void RiuMainWindowBase::setDefaultDockLayout() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuMainWindowBase::setDockLayout() +void RiuMainWindowBase::setUserDockLayout() { QAction* action = dynamic_cast( sender() ); if ( action ) { QString layoutName = action->text(); - RiuDockWidgetTools::setDockLayout( this, layoutName ); + RiuDockWidgetTools::setDockLayout( this, layoutName, true /* user layout */ ); } } @@ -816,7 +816,7 @@ void RiuMainWindowBase::addDefaultEntriesToWindowsMenu() for ( auto& layout : names ) { QAction* chooseLayoutAction = layoutsMenu->addAction( layout ); - connect( chooseLayoutAction, SIGNAL( triggered() ), this, SLOT( setDockLayout() ) ); + connect( chooseLayoutAction, SIGNAL( triggered() ), this, SLOT( setUserDockLayout() ) ); QAction* deleteLayoutAction = deleteLayoutMenu->addAction( layout ); connect( deleteLayoutAction, SIGNAL( triggered() ), this, SLOT( deleteDockLayout() ) ); } diff --git a/ApplicationLibCode/UserInterface/RiuMainWindowBase.h b/ApplicationLibCode/UserInterface/RiuMainWindowBase.h index 8339d7aa79..f8e754cf92 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindowBase.h +++ b/ApplicationLibCode/UserInterface/RiuMainWindowBase.h @@ -143,7 +143,7 @@ protected slots: void slotRefreshUndoRedoActions(); void setDefaultDockLayout(); - void setDockLayout(); + void setUserDockLayout(); void deleteDockLayout(); void saveDockLayout(); void exportDockLayout(); diff --git a/ThirdParty/qtadvanceddocking b/ThirdParty/qtadvanceddocking index 9ab26f0a03..08946f7d6e 160000 --- a/ThirdParty/qtadvanceddocking +++ b/ThirdParty/qtadvanceddocking @@ -1 +1 @@ -Subproject commit 9ab26f0a03e44f18cdebc37c6e3c2c2e3e316c1a +Subproject commit 08946f7d6ec985ba6a85122e9e3f563f4d435dcc