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

Do not gray out adjusters when automatic is enabled, fixes #5565

Browse Source
This commit is contained in:
Ingo Weyrich
2019-12-16 14:35:40 +01:00
parent 6b22101500
commit 4a25633bd7
1 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rtgui/adjuster.cc
View File

@@ -230,22 +230,7 @@ void Adjuster::setDefaultEditedState (EditedState eState)
void Adjuster::autoToggled () void Adjuster::autoToggled ()
{ {
if (!editedCheckBox) { if (adjusterListener && !blocked) {
// If not used in the BatchEditor panel
if (automatic->get_active()) {
// Disable the slider and spin button
spin->set_sensitive(false);
slider->set_sensitive(false);
reset->set_sensitive(false);
} else {
// Enable the slider and spin button
spin->set_sensitive(true);
slider->set_sensitive(true);
reset->set_sensitive(true);
}
}
if (adjusterListener != nullptr && !blocked) {
adjusterListener->adjusterAutoToggled(this); adjusterListener->adjusterAutoToggled(this);
} }
} }
@@ -380,6 +365,9 @@ void Adjuster::spinChanged ()
if (adjusterListener && !blocked) { if (adjusterListener && !blocked) {
if (!buttonReleaseSlider.connected() || afterReset) { if (!buttonReleaseSlider.connected() || afterReset) {
eventPending = false; eventPending = false;
if (automatic) {
setAutoValue(false);
}
adjusterListener->adjusterChanged(this, spin->get_value()); adjusterListener->adjusterChanged(this, spin->get_value());
} else { } else {
eventPending = true; eventPending = true;
@@ -419,6 +407,9 @@ void Adjuster::sliderChanged ()
if (adjusterListener && !blocked) { if (adjusterListener && !blocked) {
if (!buttonReleaseSlider.connected() || afterReset) { if (!buttonReleaseSlider.connected() || afterReset) {
eventPending = false; eventPending = false;
if (automatic) {
setAutoValue(false);
}
adjusterListener->adjusterChanged(this, spin->get_value()); adjusterListener->adjusterChanged(this, spin->get_value());
} else { } else {
eventPending = true; eventPending = true;
@@ -459,21 +450,6 @@ void Adjuster::setAutoValue (bool a)
const bool oldVal = autoChange.block(true); const bool oldVal = autoChange.block(true);
automatic->set_active(a); automatic->set_active(a);
autoChange.block(oldVal); autoChange.block(oldVal);
if (!editedCheckBox) {
// If not used in the BatchEditor panel
if (a) {
// Disable the slider and spin button
spin->set_sensitive(false);
slider->set_sensitive(false);
reset->set_sensitive(false);
} else {
// Enable the slider and spin button
spin->set_sensitive(true);
slider->set_sensitive(true);
reset->set_sensitive(true);
}
}
} }
} }
@@ -481,6 +457,9 @@ bool Adjuster::notifyListener ()
{ {
if (eventPending && adjusterListener != nullptr && !blocked) { if (eventPending && adjusterListener != nullptr && !blocked) {
if (automatic) {
setAutoValue(false);
}
adjusterListener->adjusterChanged(this, spin->get_value()); adjusterListener->adjusterChanged(this, spin->get_value());
} }
@@ -571,6 +550,9 @@ void Adjuster::showEditedCB ()
void Adjuster::editedToggled () void Adjuster::editedToggled ()
{ {
if (adjusterListener && !blocked) { if (adjusterListener && !blocked) {
if (automatic) {
setAutoValue(false);
}
adjusterListener->adjusterChanged(this, spin->get_value()); adjusterListener->adjusterChanged(this, spin->get_value());
} }