agx: Don't call gui_changed from gui_update; extract all dynamic redraws into function _update_redraw_dynamic_gui, called from gui_update and gui_changed; extract slider offset, scale, default and value updates into _update_pivot_slider_settings, called from _update_pivot_x (gui_changed and exposure picker callbacks) and from gui_update.

Author: kofa73

src/iop/agx.c

@@ -1371,6 +1371,23 @@ static primaries_params_t _get_primaries_params(const dt_iop_agx_params_t *p)
   return primaries_params;
 }
 
+static void _update_pivot_slider_settings(GtkWidget* const slider,
+                                         const dt_iop_agx_params_t* const p)
+{
+  darktable.gui->reset++;
+
+  const float range = p->range_white_relative_ev - p->range_black_relative_ev;
+
+  dt_bauhaus_slider_set_factor(slider, range);
+  dt_bauhaus_slider_set_offset(slider, p->range_black_relative_ev);
+  // 0 EV default with the new exposure params
+  dt_bauhaus_slider_set_default(slider, -p->range_black_relative_ev / range);
+
+  dt_bauhaus_slider_set(slider, p->curve_pivot_x);
+
+  darktable.gui->reset--;
+}
+
 static void _update_pivot_x(const float old_black_ev, const float old_white_ev, dt_iop_module_t *self, dt_iop_agx_params_t *const p)
 {
   const dt_iop_agx_gui_data_t *g = self->gui_data;
@@ -1389,14 +1406,7 @@ static void _update_pivot_x(const float old_black_ev, const float old_white_ev,
   // new_range is ensured to be > 0 due to hard limits on sliders
   p->curve_pivot_x = (clamped_pivot_ev - new_black_ev) / new_range;
 
-  darktable.gui->reset++;
-  GtkWidget* const slider = g->basic_curve_controls.curve_pivot_x;
-  dt_bauhaus_slider_set_factor(slider, new_range);
-  dt_bauhaus_slider_set_offset(slider, new_black_ev);
-  // 0 EV default with the new exposure params
-  dt_bauhaus_slider_set_default(slider, -new_black_ev / new_range);
-  dt_bauhaus_slider_set(slider, p->curve_pivot_x);
-  darktable.gui->reset--;
+  _update_pivot_slider_settings(g->basic_curve_controls.curve_pivot_x, p);
 }
 
 static void _adjust_relative_exposure_from_exposure_params(dt_iop_module_t *self)
@@ -2094,6 +2104,22 @@ static void _update_curve_warnings(dt_iop_module_t *self)
                                     ? dtgtk_cairo_paint_warning : NULL, CPF_ACTIVE, NULL);
 }
 
+static void _update_redraw_dynamic_gui(dt_iop_module_t* const self,
+                                       const dt_iop_agx_gui_data_t* const g,
+                                       const dt_iop_agx_params_t* const p)
+{
+  gtk_widget_set_visible(g->curve_gamma, !p->auto_gamma);
+  gtk_widget_set_visible(g->primaries_controls_vbox, !p->disable_primaries_adjustments);
+  const gboolean post_curve_primaries_available = !p->completely_reverse_primaries && !p->disable_primaries_adjustments;
+  gtk_widget_set_visible(g->post_curve_primaries_controls_vbox, post_curve_primaries_available);
+  gtk_widget_set_sensitive(g->set_post_curve_primaries_from_pre_button, post_curve_primaries_available);
+
+  _update_curve_warnings(self);
+
+  // Trigger redraw when any parameter changes
+  gtk_widget_queue_draw(GTK_WIDGET(g->graph_drawing_area));
+}
+
 void gui_changed(dt_iop_module_t *self,
                  GtkWidget *widget,
                  void *previous)
@@ -2138,24 +2164,15 @@ void gui_changed(dt_iop_module_t *self,
     darktable.gui->reset--;
   }
 
-  gtk_widget_set_visible(g->curve_gamma, !p->auto_gamma);
-  gtk_widget_set_visible(g->primaries_controls_vbox, !p->disable_primaries_adjustments);
-  const gboolean post_curve_primaries_available = !p->completely_reverse_primaries && !p->disable_primaries_adjustments;
-  gtk_widget_set_visible(g->post_curve_primaries_controls_vbox, post_curve_primaries_available);
-  gtk_widget_set_sensitive(g->set_post_curve_primaries_from_pre_button, post_curve_primaries_available);
-
-  _update_curve_warnings(self);
-
-  // Trigger redraw when any parameter changes
-  gtk_widget_queue_draw(GTK_WIDGET(g->graph_drawing_area));
-
   if(g && p->auto_gamma)
   {
     tone_mapping_params_t tone_mapping_params;
     _set_log_mapping_params(self->params, &tone_mapping_params);
     _adjust_pivot(self->params, &tone_mapping_params);
     dt_bauhaus_slider_set(g->curve_gamma, tone_mapping_params.curve_gamma);
   }
+
+  _update_redraw_dynamic_gui(self, g, p);
 }
 
 static GtkWidget* _create_basic_curve_controls_box(dt_iop_module_t *self,
@@ -2579,22 +2596,19 @@ static GtkWidget *_setup_hue_slider(dt_iop_module_t *self,
 
 void gui_update(dt_iop_module_t *self)
 {
-  dt_iop_agx_gui_data_t *g = self->gui_data;
-  const dt_iop_agx_params_t *p = self->params;
+  const dt_iop_agx_gui_data_t* const g = self->gui_data;
+  const dt_iop_agx_params_t* const p = self->params;
 
-  const float range = p->range_white_relative_ev - p->range_black_relative_ev;
-  dt_bauhaus_slider_set_factor(g->basic_curve_controls.curve_pivot_x, range);
-  dt_bauhaus_slider_set_offset(g->basic_curve_controls.curve_pivot_x, p->range_black_relative_ev);
+  _update_pivot_slider_settings(g->basic_curve_controls.curve_pivot_x, p);
 
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->auto_gamma),
                                p->auto_gamma);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->disable_primaries_adjustments),
                                p->disable_primaries_adjustments);
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->completely_reverse_primaries),
                                p->completely_reverse_primaries);
-  _update_curve_warnings(self);
 
-  gui_changed(self, NULL, NULL);
+  _update_redraw_dynamic_gui(self, g, p);
 }
 
 static void _create_primaries_page(dt_iop_module_t *main,