kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions 1 Packages Projects 9 Releases 2 Wiki Activity

Add loadState() function to DockWindowManager

Browse Source 
Just changing the preference for hiding or showing a dock window does
not actually trigger a state change. To enable that, the preferences
pack manager must manually instruct the DockWindowManager to save its
state into the preferences before storing a preference pack, and must
instruct the DockWindowManager to load its new state from the
preferences after loading a pack.
This commit is contained in:
Chris Hennes
2021-08-23 11:30:13 -05:00
parent 76d666779d
commit b49da2467c
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/PreferencePackManager.cpp
View File

@@ -37,6 +37,7 @@
#include "Base/Parameter.h"
#include "Base/Interpreter.h"
#include "Base/Console.h"
#include "DockWindowManager.h"
#include <App/Application.h>
@@ -204,7 +205,14 @@ bool PreferencePackManager::apply(const std::string& preferencePackName) const
std::lock_guard<std::mutex> lock(_mutex);
if (auto preferencePack = _preferencePacks.find(preferencePackName); preferencePack != _preferencePacks.end()) {
BackupCurrentConfig();
return preferencePack->second.apply();
bool wasApplied = preferencePack->second.apply();
if (wasApplied) {
// If the visibility state of the dock windows was changed we have to manually reload their state
Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance();
pDockMgr->loadState();
// TODO: Are there other things that have to be manually triggered?
}
}
else {
throw std::runtime_error("No such Preference Pack: " + preferencePackName);
@@ -215,9 +223,14 @@ void copyTemplateParameters(Base::Reference<ParameterGrp> templateGroup, const s
{
auto userParameterHandle = App::GetApplication().GetParameterGroupByPath(path.c_str());
// Ensure that the DockWindowManager has saved its current state:
Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance();
pDockMgr->saveState();
auto boolMap = templateGroup->GetBoolMap();
for (const auto& kv : boolMap) {
auto currentValue = userParameterHandle->GetBool(kv.first.c_str(), kv.second);
Base::Console().Message("Parameter %s = %d\n", kv.first.c_str(), currentValue);
outputGroup->SetBool(kv.first.c_str(), currentValue);
}