agx: new picker flag: DT_COLOR_PICKER_CALLBACK_ONLY_WHEN_DONE; no box around initial point in NO_AUTO mode

Author: kofa73

src/gui/color_picker_proxy.c

@@ -75,7 +75,7 @@ gboolean dt_iop_color_picker_is_visible(const dt_develop_t *dev)
 
 gboolean dt_iop_color_picker_is_area_empty(const dt_pickerbox_t box)
 {
-  return (fabsf(box[2] - box[0]) < 1e-5f || fabsf(box[3] - box[1]) < 1e-5f);
+  return (fabsf(box[2] - box[0]) < 1e-3f || fabsf(box[3] - box[1]) < 1e-3f);
 }
 
 static gboolean _record_point_area(dt_iop_color_picker_t *self)
@@ -325,6 +325,11 @@ static void _iop_color_picker_pickerdata_ready_callback(gpointer instance,
   pipe->changed |= DT_DEV_PIPE_REMOVE;
   pipe->cache_obsolete = TRUE;
 
+  if((picker->flags & DT_COLOR_PICKER_CALLBACK_ONLY_WHEN_DONE) && darktable.control->button_down)
+  {
+    return;
+  }
+
   // iops only need new picker data if the pointer has moved
   if(_record_point_area(picker))
   {

src/gui/color_picker_proxy.h

@@ -42,7 +42,9 @@ typedef enum _iop_color_picker_flags_t
   // all pickers sample input, only ones with this flag set sample output
   DT_COLOR_PICKER_IO = 1 << 3,
   // don't auto-expand the area, wait for user selection via dragging
-  DT_COLOR_PICKER_NO_AUTO = 1 << 4
+  DT_COLOR_PICKER_NO_AUTO = 1 << 4,
+  // only invoke the callback when the user releases the button
+  DT_COLOR_PICKER_CALLBACK_ONLY_WHEN_DONE = 1 << 5
 } dt_iop_color_picker_flags_t;
 
 typedef struct dt_iop_color_picker_t

src/iop/agx.c

@@ -1815,7 +1815,7 @@ static GtkWidget* _create_basic_curve_controls_box(dt_iop_module_t *self,
   dt_iop_basic_curve_controls_t *controls = &g->basic_curve_controls;
 
   // curve_pivot_x_relative_ev with picker
-  slider = dt_color_picker_new(self, DT_COLOR_PICKER_AREA | DT_COLOR_PICKER_DENOISE | DT_COLOR_PICKER_NO_AUTO, dt_bauhaus_slider_from_params(section, "curve_pivot_x"));
+  slider = dt_color_picker_new(self, DT_COLOR_PICKER_AREA | DT_COLOR_PICKER_DENOISE | DT_COLOR_PICKER_NO_AUTO | DT_COLOR_PICKER_CALLBACK_ONLY_WHEN_DONE, dt_bauhaus_slider_from_params(section, "curve_pivot_x"));
   controls->curve_pivot_x = slider;
   dt_bauhaus_slider_set_format(slider, _(" EV"));
   dt_bauhaus_slider_set_digits(slider, 2);
@@ -1824,7 +1824,7 @@ static GtkWidget* _create_basic_curve_controls_box(dt_iop_module_t *self,
                                                "used to set the pivot relative to mid-gray"));
 
   // curve_pivot_y_linear
-  slider = dt_color_picker_new(self, DT_COLOR_PICKER_AREA | DT_COLOR_PICKER_DENOISE | DT_COLOR_PICKER_NO_AUTO, dt_bauhaus_slider_from_params(section, "curve_pivot_y_linear_output"));
+  slider = dt_color_picker_new(self, DT_COLOR_PICKER_AREA | DT_COLOR_PICKER_DENOISE | DT_COLOR_PICKER_NO_AUTO | DT_COLOR_PICKER_CALLBACK_ONLY_WHEN_DONE, dt_bauhaus_slider_from_params(section, "curve_pivot_y_linear_output"));
   controls->curve_pivot_y_linear = slider;
   dt_bauhaus_slider_set_format(slider, "%");
   dt_bauhaus_slider_set_digits(slider, 2);

src/views/darkroom.c

@@ -3550,13 +3550,24 @@ int button_pressed(dt_view_t *self,
         }
         else
         {
-          const float dx = 0.02f;
-          const float dy = dx * (float)dev->full.pipe->processed_width / (float)dev->full.pipe->processed_height;
-          const dt_boundingbox_t fbox = { zoom_x - dx,
-                                          zoom_y - dy,
-                                          zoom_x + dx,
-                                          zoom_y + dy };
-          dt_color_picker_backtransform_box(dev, 2, fbox, sample->box);
+          dt_iop_color_picker_t *picker = darktable.lib->proxy.colorpicker.picker_proxy;
+
+          if(picker && (picker->flags & DT_COLOR_PICKER_NO_AUTO))
+          {
+            // don't create a box around the starting point; the user has to explicitly select an area by dragging
+            const dt_boundingbox_t fbox = { zoom_x, zoom_y, zoom_x, zoom_y };
+            dt_color_picker_backtransform_box(dev, 2, fbox, sample->box);
+          }
+          else
+          {
+            const float dx = 0.02f;
+            const float dy = dx * (float)dev->full.pipe->processed_width / (float)dev->full.pipe->processed_height;
+            const dt_boundingbox_t fbox = { zoom_x - dx,
+                                            zoom_y - dy,
+                                            zoom_x + dx,
+                                            zoom_y + dy };
+            dt_color_picker_backtransform_box(dev, 2, fbox, sample->box);
+          }
         }
         dt_control_change_cursor(GDK_FLEUR);
       }