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

Collapse all tools on first start (fixes #4776)

Browse Source 
I had to remove the `isVisible` check in `MyExpander::set_expanded()`
because it would trigger in Wavelet and Retinex for unknown reasons.

One inner expander in CIECAM isn't covered by the tool states, and the
way they are distributed to Wavelet and Retinex won't allow for further
tool states in those tools. We should consider to move the tool states
for sub-tools (like Wavelet, Retinex, and CIECAM) to seperate keys in
the `options` file.
This commit is contained in:
Flössie
2020-02-12 09:04:55 +01:00
parent 40018b1e9a
commit 1c0033f798
6 changed files with 133 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rtgui/wavelet.cc
View File

@@ -3030,18 +3030,32 @@ void Wavelet::writeOptions(std::vector<int> &tpOpen)
tpOpen.push_back (expfinal->get_expanded ());
}
void Wavelet::updateToolState(std::vector<int> &tpOpen)
void Wavelet::updateToolState(const std::vector<int>& tpOpen)
{
if(tpOpen.size() >= 9) {
expsettings->set_expanded(tpOpen.at(0));
expcontrast->set_expanded(tpOpen.at(1));
expchroma->set_expanded(tpOpen.at(2));
exptoning->set_expanded(tpOpen.at(3));
expnoise->set_expanded(tpOpen.at(4));
expedge->set_expanded(tpOpen.at(5));
expgamut->set_expanded(tpOpen.at(6));
expresid->set_expanded(tpOpen.at(7));
expfinal->set_expanded(tpOpen.at(8));
if (tpOpen.empty()) {
expsettings->set_expanded(false);
expcontrast->set_expanded(false);
expchroma->set_expanded(false);
exptoning->set_expanded(false);
expnoise->set_expanded(false);
expedge->set_expanded(false);
expgamut->set_expanded(false);
expresid->set_expanded(false);
expfinal->set_expanded(false);
return;
}
if (tpOpen.size() >= 9) {
expsettings->set_expanded(tpOpen[0]);
expcontrast->set_expanded(tpOpen[1]);
expchroma->set_expanded(tpOpen[2]);
exptoning->set_expanded(tpOpen[3]);
expnoise->set_expanded(tpOpen[4]);
expedge->set_expanded(tpOpen[5]);
expgamut->set_expanded(tpOpen[6]);
expresid->set_expanded(tpOpen[7]);
expfinal->set_expanded(tpOpen[8]);
}
}