From cd77350c8c37e780e29d5ee9aed6e0da65b1e910 Mon Sep 17 00:00:00 2001 From: Emil Martinec Date: Sun, 13 Feb 2011 14:54:42 -0600 Subject: [PATCH] Fixing unfortunate placement of saturation limiter slider in previous commit. --- rtgui/labcurve.cc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc index 6c6f5736d..db18717e1 100644 --- a/rtgui/labcurve.cc +++ b/rtgui/labcurve.cc @@ -36,7 +36,10 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd pack_start (*saturation); saturation->show (); - + + brightness->setAdjusterListener (this); + contrast->setAdjusterListener (this); + saturation->setAdjusterListener (this); //%%%%%%%%%%%%%%%%%% pack_start (*Gtk::manage (new Gtk::HSeparator())); @@ -50,6 +53,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd pack_start (*enablelimiter); saturationlimiter = new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 0.1, 40); + pack_start (*saturationlimiter); saturationlimiter->show (); saturationlimiter->reference (); @@ -74,12 +78,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd curveEditorG->curveListComplete(); pack_start (*curveEditorG, Gtk::PACK_SHRINK, 4); - - brightness->setAdjusterListener (this); - contrast->setAdjusterListener (this); - saturation->setAdjusterListener (this); - } LCurve::~LCurve () { @@ -120,9 +119,9 @@ void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited) { enablelimiter->set_active (pp->labCurve.enable_saturationlimiter); elconn.block (false); - removeIfThere (this, saturationlimiter, false); - if (enablelimiter->get_active () || enablelimiter->get_inconsistent()) - pack_start (*saturationlimiter); + //removeIfThere (this, saturationlimiter, false); + // if (enablelimiter->get_active () || enablelimiter->get_inconsistent()) + // pack_start (*saturationlimiter); lastACVal = pp->labCurve.avoidclip; lastELVal = pp->labCurve.enable_saturationlimiter; @@ -231,9 +230,9 @@ void LCurve::enablelimiter_toggled () { lastELVal = enablelimiter->get_active (); } - removeIfThere (this, saturationlimiter, false); - if (enablelimiter->get_active () || enablelimiter->get_inconsistent()) - pack_start (*saturationlimiter); + //removeIfThere (this, saturationlimiter, false); + //if (enablelimiter->get_active () || enablelimiter->get_inconsistent()) + // pack_start (*saturationlimiter); if (listener) { if (enablelimiter->get_active ())