diff options
author | Henning Gruendl <henning.gruendl@qt.io> | 2020-03-09 08:30:17 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-03-09 11:40:19 +0000 |
commit | 73aaa2a38119b48c187fff2e9170ec900a77f91a (patch) | |
tree | 833acd0daca6f8167afeb401fb71f00f36abe8a7 /src/libs | |
parent | 6de4e496466d6eecdfd3191f36bd6fba20347fdb (diff) |
ADS: Hide detached window if not in design mode
Task-number: QDS-1672
Change-Id: Ia20113cb9025c19194d87920cf060d2b9791e52a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/advanceddockingsystem/dockmanager.cpp | 14 | ||||
-rw-r--r-- | src/libs/advanceddockingsystem/dockmanager.h | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index 80e4588125..39b7062c09 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -98,6 +98,7 @@ namespace ADS bool m_autorestoreLastWorkspace; // This option is set in the Workspace Manager! QSettings *m_settings = nullptr; QString m_workspacePresetsPath; + bool m_modeChangeState; /** * Private data constructor @@ -576,6 +577,9 @@ namespace ADS bool DockManager::save() { + if (isModeChangeState()) + return false; + emit aboutToSaveWorkspace(); bool result = write(activeWorkspace(), saveState(), parentWidget()); @@ -836,6 +840,16 @@ namespace ADS return result; } + void DockManager::setModeChangeState(bool value) + { + d->m_modeChangeState = value; + } + + bool DockManager::isModeChangeState() const + { + return d->m_modeChangeState; + } + bool DockManager::write(const QString &workspace, const QByteArray &data, QString *errorString) const { Utils::FilePath filename = workspaceNameToFileName(workspace); diff --git a/src/libs/advanceddockingsystem/dockmanager.h b/src/libs/advanceddockingsystem/dockmanager.h index e52646437f..a987a1977b 100644 --- a/src/libs/advanceddockingsystem/dockmanager.h +++ b/src/libs/advanceddockingsystem/dockmanager.h @@ -473,6 +473,9 @@ public: bool isWorkspacePreset(const QString &workspace) const; + void setModeChangeState(bool value); + bool isModeChangeState() const; + signals: void aboutToUnloadWorkspace(QString workspaceName); void aboutToLoadWorkspace(QString workspaceName); |