Skip to content

select first enabled exposure module without mask #19565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2025
+54 −55
Merged

select first enabled exposure module without mask #19565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/develop/blend_gui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,11 +709,8 @@ static void _blendop_masks_mode_callback(const dt_develop_mask_mode_t mask_mode,

dt_dev_add_history_item(darktable.develop, data->module, TRUE);

if(dt_conf_get_bool("accel/prefer_unmasked"))
{
// rebuild the accelerators
dt_iop_connect_accels_multi(data->module->so);
}
// rebuild the accelerators
dt_iop_connect_accels_multi(data->module->so);
}

static void _blendop_blend_mode_callback(GtkWidget *combo,
Expand Down
102 changes: 52 additions & 50 deletions src/develop/imageop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3620,6 +3620,40 @@ dt_iop_module_t *dt_iop_get_module_by_op_priority(GList *modules,
return mod_ret;
}

dt_iop_module_t *_find_preferred_instance(const dt_iop_module_so_t *module,
const gboolean prefer_expanded,
const gboolean prefer_enabled,
const gboolean prefer_unmasked,
const gboolean prefer_first)
{
dt_iop_module_t *best_mod = NULL;
int best_score = -1;

for(GList *iop_mods = g_list_last(darktable.develop->iop);
iop_mods;
iop_mods = g_list_previous(iop_mods))
{
dt_iop_module_t *mod = iop_mods->data;

if(mod->so == module && mod->iop_order != INT_MAX)
{
const gboolean no_mask = mod->blend_params->mask_mode == DEVELOP_MASK_DISABLED
|| mod->blend_params->mask_mode == DEVELOP_MASK_ENABLED;
const int score = (mod->expanded && prefer_expanded ? 8 : 0)
+ (mod->enabled && prefer_enabled ? 4 : 0)
+ (no_mask && prefer_unmasked ? 2 : 0);

if(score + (prefer_first ? 1 : 0) > best_score)
{
best_score = score;
best_mod = mod;
}
}
}

return best_mod;
}

dt_iop_module_t *dt_iop_get_module_preferred_instance(const dt_iop_module_so_t *module)
{
/*
Expand All @@ -3644,68 +3678,36 @@ dt_iop_module_t *dt_iop_get_module_preferred_instance(const dt_iop_module_so_t *
- selection order (after applying the above rules, apply the
shortcut to the first or last instance remaining)
*/
const gboolean prefer_focused = dt_conf_get_bool("accel/prefer_focused");
const int prefer_expanded = dt_conf_get_bool("accel/prefer_expanded") ? 8 : 0;
const int prefer_enabled = dt_conf_get_bool("accel/prefer_enabled") ? 4 : 0;
const int prefer_unmasked = dt_conf_get_bool("accel/prefer_unmasked") ? 2 : 0;
const int prefer_first = dt_conf_is_equal("accel/select_order", "first instance") ? 1 : 0;

dt_iop_module_t *accel_mod = NULL; // The module to which accelerators are to be attached

// if any instance has focus, use that one
dt_iop_module_t *gui_module = dt_dev_gui_module();
if(prefer_focused
&& gui_module
&& (gui_module->so == module
|| DT_ACTION(module) == &darktable.control->actions_focus))
accel_mod = gui_module;
if(DT_ACTION(module) == &darktable.control->actions_focus
|| (gui_module && gui_module->so == module
&& dt_conf_get_bool("accel/prefer_focused")))
return gui_module;
else
{
int best_score = -1;

for(GList *iop_mods = g_list_last(darktable.develop->iop);
iop_mods;
iop_mods = g_list_previous(iop_mods))
{
dt_iop_module_t *mod = iop_mods->data;

if(mod->so == module && mod->iop_order != INT_MAX)
{
const int score = (mod->expanded ? prefer_expanded : 0)
+ (mod->enabled ? prefer_enabled : 0)
+ (mod->blend_params->mask_mode == DEVELOP_MASK_DISABLED
|| mod->blend_params->mask_mode == DEVELOP_MASK_ENABLED
? prefer_unmasked : 0);

if(score + prefer_first > best_score)
{
best_score = score;
accel_mod = mod;
}
}
}
}

return accel_mod;
return _find_preferred_instance(module,
dt_conf_get_bool("accel/prefer_expanded"),
dt_conf_get_bool("accel/prefer_enabled"),
dt_conf_get_bool("accel/prefer_unmasked"),
dt_conf_is_equal("accel/select_order", "first instance"));
}

/** adds keyboard accels to the first module in the pipe to handle
* where there are multiple instances */
void dt_iop_connect_accels_multi(dt_iop_module_so_t *module)
{
if(darktable.develop->gui_attached)
{
dt_iop_module_t *accel_mod_new = dt_iop_get_module_preferred_instance(module);
if(!darktable.develop->gui_attached) return;

// switch accelerators to new module
if(accel_mod_new)
{
dt_accel_connect_instance_iop(accel_mod_new);
dt_iop_module_t *accel_mod_new = dt_iop_get_module_preferred_instance(module);

if(!strcmp(accel_mod_new->op, "exposure"))
darktable.develop->proxy.exposure.module = accel_mod_new;
}
}
// switch accelerators to new module
if(accel_mod_new)
dt_accel_connect_instance_iop(accel_mod_new);

if(!strcmp(module->op, "exposure"))
darktable.develop->proxy.exposure.module =
_find_preferred_instance(module, FALSE, TRUE, TRUE, TRUE);
}

void dt_iop_connect_accels_all(void)
Expand Down
Loading