liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2020-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rtgui/toolpanelcoord.cc
View File

@@ -723,36 +723,48 @@ void ToolPanelCoordinator::closeImage()
void ToolPanelCoordinator::closeAllTools()
{
for (size_t i = 0; i < options.tpOpen.size(); i++)
for (size_t i = 0; i < options.tpOpen.size(); ++i) {
if (i < expList.size()) {
expList.at(i)->set_expanded(false);
expList[i]->set_expanded(false);
}
}
}
void ToolPanelCoordinator::openAllTools()
{
for (size_t i = 0; i < options.tpOpen.size(); i++)
for (size_t i = 0; i < options.tpOpen.size(); ++i) {
if (i < expList.size()) {
expList.at(i)->set_expanded(true);
expList[i]->set_expanded(true);
}
}
}
void ToolPanelCoordinator::updateToolState()
{
for (size_t i = 0; i < options.tpOpen.size(); i++)
if (i < expList.size()) {
expList.at(i)->set_expanded(options.tpOpen.at(i));
if (options.tpOpen.empty()) {
for (auto expander : expList) {
expander->set_expanded(false);
}
wavelet->updateToolState({});
retinex->updateToolState({});
return;
}
for (size_t i = 0; i < options.tpOpen.size(); ++i) {
if (i < expList.size()) {
expList[i]->set_expanded(options.tpOpen[i]);
}
}
if (options.tpOpen.size() > expList.size()) {
size_t sizeWavelet = options.tpOpen.size() - expList.size();
const size_t sizeWavelet = options.tpOpen.size() - expList.size();
std::vector<int> temp;
for (size_t i = 0; i < sizeWavelet; i++) {
temp.push_back(options.tpOpen.at(i + expList.size()));
for (size_t i = 0; i < sizeWavelet; ++i) {
temp.push_back(options.tpOpen[i + expList.size()]);
}
locallab->updateToolState(temp);