Skip to content

Commit d6ca2bc

Browse files
Masks API: remove call to redraws
Redundant with high-level management in darkroom
1 parent 87bf061 commit d6ca2bc

File tree

7 files changed

+68
-68
lines changed

7 files changed

+68
-68
lines changed

src/develop/masks/brush.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "common/imagebuf.h"
2121
#include "common/undo.h"
2222
#include "control/conf.h"
23-
#include "control/control.h"
23+
2424
#include "develop/blend.h"
2525
#include "develop/imageop.h"
2626
#include "develop/masks.h"
@@ -1141,7 +1141,7 @@ static int _brush_events_mouse_scrolled(struct dt_iop_module_t *module, float pz
11411141
}
11421142
dt_toast_log(_("size: %3.2f%%"), masks_border*2.f*100.f);
11431143
}
1144-
dt_control_queue_redraw_center();
1144+
11451145
return 1;
11461146
}
11471147
else if(gui->form_selected || gui->point_selected >= 0 || gui->feather_selected >= 0
@@ -1319,7 +1319,7 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module, float pz
13191319
gui->pressure_sensitivity = DT_MASKS_PRESSURE_BRUSHSIZE_REL;
13201320
}
13211321

1322-
dt_control_queue_redraw_center();
1322+
13231323
return 1;
13241324
}
13251325
else if(gui->source_selected && gui->edit_mode == DT_MASKS_EDIT_FULL)
@@ -1374,20 +1374,20 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module, float pz
13741374
gui->scrolly = pzy;
13751375
}
13761376
gui->point_edited = gui->point_dragging = gui->point_selected;
1377-
dt_control_queue_redraw_center();
1377+
13781378
return 1;
13791379
}
13801380
else if(gui->feather_selected >= 0)
13811381
{
13821382
gui->feather_dragging = gui->feather_selected;
1383-
dt_control_queue_redraw_center();
1383+
13841384
return 1;
13851385
}
13861386
else if(gui->point_border_selected >= 0)
13871387
{
13881388
gui->point_edited = -1;
13891389
gui->point_border_dragging = gui->point_border_selected;
1390-
dt_control_queue_redraw_center();
1390+
13911391
return 1;
13921392
}
13931393
else if(gui->seg_selected >= 0)
@@ -1428,7 +1428,7 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module, float pz
14281428
dt_masks_gui_form_create(form, gui, index, module);
14291429
gui->point_edited = gui->point_dragging = gui->point_selected = gui->seg_selected + 1;
14301430
gui->seg_selected = -1;
1431-
dt_control_queue_redraw_center();
1431+
14321432
}
14331433
else if(gui->seg_selected < nb - 1)
14341434
{
@@ -1451,7 +1451,7 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module, float pz
14511451

14521452
dt_masks_set_edit_mode(module, DT_MASKS_EDIT_FULL);
14531453
dt_masks_iop_update(module);
1454-
dt_control_queue_redraw_center();
1454+
14551455
return 1;
14561456
}
14571457
else if(gui->point_selected >= 0 && which == 3)
@@ -1487,7 +1487,7 @@ static int _brush_events_button_pressed(struct dt_iop_module_t *module, float pz
14871487

14881488
// we delete or remove the shape
14891489
dt_masks_form_remove(module, NULL, form);
1490-
dt_control_queue_redraw_center();
1490+
14911491
return 1;
14921492
}
14931493
dt_masks_point_brush_t *point
@@ -1725,7 +1725,7 @@ static int _brush_events_button_released(struct dt_iop_module_t *module, float p
17251725
dt_masks_change_form_gui(NULL);
17261726
}
17271727

1728-
dt_control_queue_redraw_center();
1728+
17291729
return 1;
17301730
}
17311731
else if(gui->form_dragging)
@@ -1873,7 +1873,7 @@ static int _brush_events_button_released(struct dt_iop_module_t *module, float p
18731873
// we save the move
18741874

18751875
dt_masks_update_image(darktable.develop);
1876-
dt_control_queue_redraw_center();
1876+
18771877
return 1;
18781878
}
18791879

@@ -1906,7 +1906,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
19061906
dt_masks_dynbuf_add_2(gui->guipoints_payload, density, pressure);
19071907
gui->guipoints_count++;
19081908
}
1909-
dt_control_queue_redraw_center();
1909+
19101910
return 1;
19111911
}
19121912
else if(gui->point_dragging >= 0)
@@ -1929,7 +1929,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
19291929
// we recreate the form points
19301930
dt_masks_gui_form_remove(form, gui, index);
19311931
dt_masks_gui_form_create(form, gui, index, module);
1932-
dt_control_queue_redraw_center();
1932+
19331933
return 1;
19341934
}
19351935
else if(gui->seg_dragging >= 0)
@@ -1968,7 +1968,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
19681968
dt_masks_gui_form_remove(form, gui, index);
19691969
dt_masks_gui_form_create(form, gui, index, module);
19701970

1971-
dt_control_queue_redraw_center();
1971+
19721972
return 1;
19731973
}
19741974
else if(gui->feather_dragging >= 0)
@@ -1995,7 +1995,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
19951995
// we recreate the form points
19961996
dt_masks_gui_form_remove(form, gui, index);
19971997
dt_masks_gui_form_create(form, gui, index, module);
1998-
dt_control_queue_redraw_center();
1998+
19991999
return 1;
20002000
}
20012001
else if(gui->point_border_dragging >= 0)
@@ -2027,7 +2027,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
20272027
// we recreate the form points
20282028
dt_masks_gui_form_remove(form, gui, index);
20292029
dt_masks_gui_form_create(form, gui, index, module);
2030-
dt_control_queue_redraw_center();
2030+
20312031
return 1;
20322032
}
20332033
else if(gui->form_dragging || gui->source_dragging)
@@ -2063,7 +2063,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
20632063
// we recreate the form points
20642064
dt_masks_gui_form_remove(form, gui, index);
20652065
dt_masks_gui_form_create(form, gui, index, module);
2066-
dt_control_queue_redraw_center();
2066+
20672067
return 1;
20682068
}
20692069

@@ -2093,7 +2093,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
20932093
if(pzx - ffx > -as && pzx - ffx < as && pzy - ffy > -as && pzy - ffy < as)
20942094
{
20952095
gui->feather_selected = k;
2096-
dt_control_queue_redraw_center();
2096+
20972097
return 1;
20982098
}
20992099
}
@@ -2104,7 +2104,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
21042104
&& pzy - gpt->points[k * 6 + 3] < as)
21052105
{
21062106
gui->point_selected = k;
2107-
dt_control_queue_redraw_center();
2107+
21082108
return 1;
21092109
}
21102110
}
@@ -2118,7 +2118,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
21182118
&& pzy - gpt->points[k * 6 + 3] < as)
21192119
{
21202120
gui->point_selected = k;
2121-
dt_control_queue_redraw_center();
2121+
21222122
return 1;
21232123
}
21242124

@@ -2129,7 +2129,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
21292129
&& pzy - gpt->border[k * 6 + 1] < as)
21302130
{
21312131
gui->point_border_selected = k;
2132-
dt_control_queue_redraw_center();
2132+
21332133
return 1;
21342134
}
21352135
}
@@ -2156,7 +2156,7 @@ static int _brush_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
21562156
gui->form_selected = TRUE;
21572157
}
21582158
}
2159-
dt_control_queue_redraw_center();
2159+
21602160
if(!gui->form_selected && !gui->border_selected && gui->seg_selected < 0) return 0;
21612161
if(gui->edit_mode != DT_MASKS_EDIT_FULL) return 0;
21622162
return 1;

src/develop/masks/circle.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "common/debug.h"
2020
#include "common/undo.h"
2121
#include "control/conf.h"
22-
#include "control/control.h"
22+
2323
#include "develop/blend.h"
2424
#include "develop/imageop.h"
2525
#include "develop/masks.h"
@@ -216,7 +216,7 @@ static int _circle_events_button_pressed(struct dt_iop_module_t *module, float p
216216
{
217217
dt_masks_set_edit_mode(module, DT_MASKS_EDIT_FULL);
218218
dt_masks_iop_update(module);
219-
dt_control_queue_redraw_center();
219+
220220
return 1;
221221
}
222222
else if(gui->creation && which == 1
@@ -444,7 +444,7 @@ static int _circle_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
444444
// we recreate the form points
445445
dt_masks_gui_form_remove(form, gui, index);
446446
dt_masks_gui_form_create(form, gui, index, module);
447-
dt_control_queue_redraw_center();
447+
448448
return 1;
449449
}
450450
else if(!gui->creation)
@@ -482,15 +482,15 @@ static int _circle_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
482482
gui->border_selected = FALSE;
483483
gui->source_selected = FALSE;
484484
}
485-
dt_control_queue_redraw_center();
485+
486486
if(!gui->form_selected && !gui->border_selected) return 0;
487487
if(gui->edit_mode != DT_MASKS_EDIT_FULL) return 0;
488488
return 1;
489489
}
490490
// add a preview when creating a circle
491491
else if(gui->creation)
492492
{
493-
dt_control_queue_redraw_center();
493+
494494
return 1;
495495
}
496496

src/develop/masks/ellipse.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "common/debug.h"
2020
#include "common/undo.h"
2121
#include "control/conf.h"
22-
#include "control/control.h"
22+
2323
#include "develop/blend.h"
2424
#include "develop/imageop.h"
2525
#include "develop/masks.h"
@@ -712,7 +712,7 @@ static int _ellipse_events_button_pressed(struct dt_iop_module_t *module, float
712712
{
713713
dt_masks_set_edit_mode(module, DT_MASKS_EDIT_FULL);
714714
dt_masks_iop_update(module);
715-
dt_control_queue_redraw_center();
715+
716716
return 1;
717717
}
718718
else if(gui->creation && which == 1
@@ -1098,7 +1098,7 @@ static int _ellipse_events_mouse_moved(struct dt_iop_module_t *module, float pzx
10981098
// we recreate the form points
10991099
dt_masks_gui_form_remove(form, gui, index);
11001100
dt_masks_gui_form_create(form, gui, index, module);
1101-
dt_control_queue_redraw_center();
1101+
11021102
return 1;
11031103
}
11041104
else if(gui->point_dragging >= 1)
@@ -1176,7 +1176,7 @@ static int _ellipse_events_mouse_moved(struct dt_iop_module_t *module, float pzx
11761176
// we recreate the form points
11771177
dt_masks_gui_form_remove(form, gui, index);
11781178
dt_masks_gui_form_create(form, gui, index, module);
1179-
dt_control_queue_redraw_center();
1179+
11801180
return 1;
11811181
}
11821182
else if(gui->form_rotating)
@@ -1224,7 +1224,7 @@ static int _ellipse_events_mouse_moved(struct dt_iop_module_t *module, float pzx
12241224
gui->dx = xref - gui->posx;
12251225
gui->dy = yref - gui->posy;
12261226

1227-
dt_control_queue_redraw_center();
1227+
12281228
return 1;
12291229
}
12301230
else if(!gui->creation)
@@ -1282,15 +1282,15 @@ static int _ellipse_events_mouse_moved(struct dt_iop_module_t *module, float pzx
12821282
}
12831283
}
12841284

1285-
dt_control_queue_redraw_center();
1285+
12861286
if(!gui->form_selected && !gui->border_selected) return 0;
12871287
if(gui->edit_mode != DT_MASKS_EDIT_FULL) return 0;
12881288
return 1;
12891289
}
12901290
// add a preview when creating an ellipse
12911291
else if(gui->creation)
12921292
{
1293-
dt_control_queue_redraw_center();
1293+
12941294
return 1;
12951295
}
12961296

src/develop/masks/gradient.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "common/debug.h"
2020
#include "common/undo.h"
2121
#include "control/conf.h"
22-
#include "control/control.h"
22+
2323
#include "develop/blend.h"
2424
#include "develop/imageop.h"
2525
#include "develop/masks.h"
@@ -206,7 +206,7 @@ static int _gradient_events_button_pressed(struct dt_iop_module_t *module, float
206206
{
207207
dt_masks_set_edit_mode(module, DT_MASKS_EDIT_FULL);
208208
dt_masks_iop_update(module);
209-
dt_control_queue_redraw_center();
209+
210210
return 1;
211211
}
212212
else if(gui->creation)
@@ -457,7 +457,7 @@ static int _gradient_events_mouse_moved(struct dt_iop_module_t *module, float pz
457457
{
458458
if(gui->creation && gui->form_dragging)
459459
{
460-
dt_control_queue_redraw_center();
460+
461461
return 1;
462462
}
463463
else if(gui->form_dragging)
@@ -477,7 +477,7 @@ static int _gradient_events_mouse_moved(struct dt_iop_module_t *module, float pz
477477
// we recreate the form points
478478
dt_masks_gui_form_remove(form, gui, index);
479479
dt_masks_gui_form_create(form, gui, index, module);
480-
dt_control_queue_redraw_center();
480+
481481
return 1;
482482
}
483483
if(gui->form_rotating)
@@ -517,7 +517,7 @@ static int _gradient_events_mouse_moved(struct dt_iop_module_t *module, float pz
517517
// we recreate the form points
518518
dt_masks_gui_form_remove(form, gui, index);
519519
dt_masks_gui_form_create(form, gui, index, module);
520-
dt_control_queue_redraw_center();
520+
521521
return 1;
522522
}
523523
else if(!gui->creation)
@@ -568,15 +568,15 @@ static int _gradient_events_mouse_moved(struct dt_iop_module_t *module, float pz
568568
gui->border_selected = FALSE;
569569
}
570570

571-
dt_control_queue_redraw_center();
571+
572572
if(!gui->form_selected && !gui->border_selected) return 0;
573573
if(gui->edit_mode != DT_MASKS_EDIT_FULL) return 0;
574574
return 1;
575575
}
576576
// add a preview when creating a gradient
577577
else if(gui->creation)
578578
{
579-
dt_control_queue_redraw_center();
579+
580580
return 1;
581581
}
582582

src/develop/masks/group.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
#include "common/debug.h"
1919
#include "control/conf.h"
20-
#include "control/control.h"
20+
#include"control/control.h"
2121
#include "develop/blend.h"
2222
#include "develop/imageop.h"
2323
#include "develop/masks.h"
@@ -52,7 +52,7 @@ static int _group_events_button_pressed(struct dt_iop_module_t *module, float pz
5252
gui->point_border_selected = gui->seg_selected = gui->point_selected = gui->feather_selected = -1;
5353
gui->point_border_dragging = gui->seg_dragging = gui->feather_dragging = gui->point_dragging = -1;
5454

55-
dt_control_queue_redraw_center();
55+
5656
return 1;
5757
}
5858
if(gui->group_edited >= 0)
@@ -183,7 +183,7 @@ static int _group_events_mouse_moved(struct dt_iop_module_t *module, float pzx,
183183
return sel->functions->mouse_moved(module, pzx, pzy, pressure, which, sel, sel_fpt->parentid, gui, gui->group_edited);
184184
}
185185

186-
dt_control_queue_redraw_center();
186+
187187
return 0;
188188
}
189189

0 commit comments

Comments
 (0)