Skip to content

RFC: move filmic graph to within the notebook to save space #21107

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

Open
jenshannoschwalm wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −17
Open

RFC: move filmic graph to within the notebook to save space #21107

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
59 changes: 42 additions & 17 deletions src/iop/filmicrgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4335,6 +4335,16 @@ static gboolean area_motion_notify(GtkWidget *widget, const GdkEventMotion *even
}
}

static void _tab_switch(GtkNotebook *notebook, GtkWidget *page, guint page_num, GtkWidget *area)
{
if(page_num == 1 || page_num == 4) return;

g_object_ref(area);
gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(area)), area);
gtk_box_pack_end(GTK_BOX(page), area, TRUE, TRUE, 0);
g_object_unref(area);
}

void gui_init(dt_iop_module_t *self)
{
dt_iop_filmicrgb_gui_data_t *g = IOP_GUI_ALLOC(filmicrgb);
Expand Down Expand Up @@ -4362,9 +4372,16 @@ void gui_init(dt_iop_module_t *self)
static struct dt_action_def_t notebook_def = { };
g->notebook = dt_ui_notebook_new(&notebook_def);
dt_action_define_iop(self, NULL, N_("page"), GTK_WIDGET(g->notebook), &notebook_def);
GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_VERTICAL);

// Page SCENE
self->widget = dt_ui_notebook_page(g->notebook, N_("scene"), NULL);
GtkWidget *page = dt_ui_notebook_page(g->notebook, N_("scene"), NULL);

self->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_size_group_add_widget(group, self->widget);
gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(self->widget), FALSE, FALSE, 0);

gtk_box_pack_end(GTK_BOX(page), GTK_WIDGET(g->area), TRUE, TRUE, 0);

g->grey_point_source
= dt_color_picker_new(self, DT_COLOR_PICKER_AREA | DT_COLOR_PICKER_DENOISE,
Expand Down Expand Up @@ -4490,7 +4507,11 @@ void gui_init(dt_iop_module_t *self)
"decrease if you see magenta or out-of-gamut highlights."));

// Page LOOK
self->widget = dt_ui_notebook_page(g->notebook, N_("look"), NULL);
page = dt_ui_notebook_page(g->notebook, N_("look"), NULL);

self->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_size_group_add_widget(group, self->widget);
gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(self->widget), FALSE, FALSE, 0);

g->contrast = dt_bauhaus_slider_from_params(self, N_("contrast"));
dt_bauhaus_slider_set_soft_range(g->contrast, 0.5, 3.0);
Expand Down Expand Up @@ -4532,7 +4553,11 @@ void gui_init(dt_iop_module_t *self)
"increase if shadows and/or highlights are under-saturated."));

// Page DISPLAY
self->widget = dt_ui_notebook_page(g->notebook, N_("display"), NULL);
page = dt_ui_notebook_page(g->notebook, N_("display"), NULL);

self->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_size_group_add_widget(group, self->widget);
gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(self->widget), FALSE, FALSE, 0);

// Black slider
g->black_point_target = dt_bauhaus_slider_from_params(self, "black_point_target");
Expand All @@ -4557,6 +4582,17 @@ void gui_init(dt_iop_module_t *self)
_("luminance of output pure white, this should be 100%\n"
"except if you want a faded look"));

// Curve type
g->highlights = dt_bauhaus_combobox_from_params(self, "highlights");
gtk_widget_set_tooltip_text(g->highlights, _("choose the desired curvature of the filmic spline in highlights.\n"
"hard uses a high curvature resulting in more tonal compression.\n"
"soft uses a low curvature resulting in less tonal compression."));

g->shadows = dt_bauhaus_combobox_from_params(self, "shadows");
gtk_widget_set_tooltip_text(g->shadows, _("choose the desired curvature of the filmic spline in shadows.\n"
"hard uses a high curvature resulting in more tonal compression.\n"
"soft uses a low curvature resulting in less tonal compression."));

// Page OPTIONS
self->widget = dt_ui_notebook_page(g->notebook, N_("options"), NULL);

Expand All @@ -4575,19 +4611,6 @@ void gui_init(dt_iop_module_t *self)
const int pos = dt_bauhaus_combobox_get_from_value(g->preserve_color, DT_FILMIC_METHOD_EUCLIDEAN_NORM_V1);
dt_bauhaus_combobox_remove_at(g->preserve_color, pos);

// Curve type
g->highlights = dt_bauhaus_combobox_from_params(self, "highlights");
gtk_widget_set_tooltip_text(g->highlights,
_("choose the desired curvature of the filmic spline in highlights.\n"
"hard uses a high curvature resulting in more tonal compression.\n"
"soft uses a low curvature resulting in less tonal compression."));

g->shadows = dt_bauhaus_combobox_from_params(self, "shadows");
gtk_widget_set_tooltip_text(g->shadows,
_("choose the desired curvature of the filmic spline in shadows.\n"
"hard uses a high curvature resulting in more tonal compression.\n"
"soft uses a low curvature resulting in less tonal compression."));

g->custom_grey = dt_bauhaus_toggle_from_params(self, "custom_grey");
gtk_widget_set_tooltip_text(g->custom_grey,
/* xgettext:no-c-format */
Expand Down Expand Up @@ -4624,7 +4647,9 @@ void gui_init(dt_iop_module_t *self)
"this is useful to match natural sensor noise pattern."));

// start building top level widget
self->widget = dt_gui_vbox(g->area, g->notebook);
g_signal_connect(G_OBJECT(g->notebook), "switch_page", G_CALLBACK(_tab_switch), g->area);
g_object_unref(group);
self->widget = dt_gui_vbox(g->notebook);
}

void gui_changed(dt_iop_module_t *self, GtkWidget *w, void *previous)
Expand Down