1cfe27e73e
The Fade curve is meant to use the widget's foreground color. The current code detects this by checking if the curve's predefined color has an alpha value of 0 - if it does, INPUT_COLOR (i) returns NULL and sends a NULL color variable to gimp_curve_view_set_curve (). However, since the GeglColor port, the "color" variable is an empty GeglColor object rather than a pure NULL value. Thus, the line was always drawn with the default GeglColor value which is difficult to see in light mode. This patch adds a tertiary conditional statement so that a pure NULL is sent if the alpha value is 0, rather than the color variable.
513 lines
18 KiB
C
513 lines
18 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpdynamicsoutputeditor.c
|
|
* Copyright (C) 2010 Alexia Death
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gegl.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
#include "libgimpcolor/gimpcolor.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimpcurve.h"
|
|
#include "core/gimpdynamicsoutput.h"
|
|
|
|
#include "gimpcurveview.h"
|
|
#include "gimpdynamicsoutputeditor.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
#define CURVE_SIZE 185
|
|
#define CURVE_BORDER 4
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_OUTPUT
|
|
};
|
|
|
|
enum
|
|
{
|
|
INPUT_COLUMN_INDEX,
|
|
INPUT_COLUMN_USE_INPUT,
|
|
INPUT_COLUMN_NAME,
|
|
INPUT_COLUMN_COLOR,
|
|
INPUT_N_COLUMNS
|
|
};
|
|
|
|
|
|
struct
|
|
{
|
|
const gchar *use_property;
|
|
const gchar *curve_property;
|
|
const gchar *label;
|
|
const gdouble color[4];
|
|
}
|
|
inputs[] =
|
|
{
|
|
{ "use-pressure", "pressure-curve", N_("Pressure"), { 1.0, 0.0, 0.0, 1.0 } },
|
|
{ "use-velocity", "velocity-curve", N_("Velocity"), { 0.0, 1.0, 0.0, 1.0 } },
|
|
{ "use-direction", "direction-curve", N_("Direction"), { 0.0, 0.0, 1.0, 1.0 } },
|
|
{ "use-tilt", "tilt-curve", N_("Tilt"), { 1.0, 0.5, 0.0, 1.0 } },
|
|
{ "use-wheel", "wheel-curve", N_("Wheel / Rotation"), { 1.0, 0.0, 1.0, 1.0 } },
|
|
{ "use-random", "random-curve", N_("Random"), { 0.0, 1.0, 1.0, 1.0 } },
|
|
{ "use-fade", "fade-curve", N_("Fade"), { 0.5, 0.5, 0.5, 0.0 } }
|
|
};
|
|
|
|
#define INPUT_COLOR(i) (inputs[(i)].color[3] ? &inputs[(i)].color : NULL)
|
|
|
|
|
|
typedef struct _GimpDynamicsOutputEditorPrivate GimpDynamicsOutputEditorPrivate;
|
|
|
|
struct _GimpDynamicsOutputEditorPrivate
|
|
{
|
|
GimpDynamicsOutput *output;
|
|
|
|
GtkListStore *input_list;
|
|
GtkTreeIter input_iters[G_N_ELEMENTS (inputs)];
|
|
|
|
GtkWidget *curve_view;
|
|
GtkWidget *input_view;
|
|
|
|
GimpCurve *active_curve;
|
|
};
|
|
|
|
#define GET_PRIVATE(editor) \
|
|
((GimpDynamicsOutputEditorPrivate *) gimp_dynamics_output_editor_get_instance_private ((GimpDynamicsOutputEditor *) (editor)))
|
|
|
|
|
|
static void gimp_dynamics_output_editor_constructed (GObject *object);
|
|
static void gimp_dynamics_output_editor_finalize (GObject *object);
|
|
static void gimp_dynamics_output_editor_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_dynamics_output_editor_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
static void gimp_dynamics_output_editor_curve_reset (GtkWidget *button,
|
|
GimpDynamicsOutputEditor *editor);
|
|
|
|
static void gimp_dynamics_output_editor_input_selected (GtkTreeSelection *selection,
|
|
GimpDynamicsOutputEditor *editor);
|
|
|
|
static void gimp_dynamics_output_editor_input_toggled (GtkCellRenderer *cell,
|
|
gchar *path,
|
|
GimpDynamicsOutputEditor *editor);
|
|
|
|
static void gimp_dynamics_output_editor_activate_input (GimpDynamicsOutputEditor *editor,
|
|
gint input);
|
|
|
|
static void gimp_dynamics_output_editor_notify_output (GimpDynamicsOutput *output,
|
|
const GParamSpec *pspec,
|
|
GimpDynamicsOutputEditor *editor);
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_PRIVATE (GimpDynamicsOutputEditor,
|
|
gimp_dynamics_output_editor, GTK_TYPE_BOX)
|
|
|
|
#define parent_class gimp_dynamics_output_editor_parent_class
|
|
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_class_init (GimpDynamicsOutputEditorClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
object_class->constructed = gimp_dynamics_output_editor_constructed;
|
|
object_class->finalize = gimp_dynamics_output_editor_finalize;
|
|
object_class->set_property = gimp_dynamics_output_editor_set_property;
|
|
object_class->get_property = gimp_dynamics_output_editor_get_property;
|
|
|
|
g_object_class_install_property (object_class, PROP_OUTPUT,
|
|
g_param_spec_object ("output",
|
|
NULL, NULL,
|
|
GIMP_TYPE_DYNAMICS_OUTPUT,
|
|
GIMP_PARAM_READWRITE |
|
|
G_PARAM_CONSTRUCT_ONLY));
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor)
|
|
{
|
|
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
|
|
GTK_ORIENTATION_VERTICAL);
|
|
|
|
gtk_box_set_spacing (GTK_BOX (editor), 6);
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_constructed (GObject *object)
|
|
{
|
|
GimpDynamicsOutputEditor *editor;
|
|
GimpDynamicsOutputEditorPrivate *private;
|
|
GtkWidget *view;
|
|
GtkWidget *button;
|
|
GtkCellRenderer *cell;
|
|
GtkTreeSelection *tree_sel;
|
|
gint i;
|
|
GimpDynamicsOutputType output_type;
|
|
const gchar *type_desc;
|
|
|
|
editor = GIMP_DYNAMICS_OUTPUT_EDITOR (object);
|
|
private = GET_PRIVATE (object);
|
|
|
|
G_OBJECT_CLASS (parent_class)->constructed (object);
|
|
|
|
gimp_assert (GIMP_IS_DYNAMICS_OUTPUT (private->output));
|
|
|
|
private->curve_view = gimp_curve_view_new ();
|
|
g_object_set (private->curve_view,
|
|
"border-width", CURVE_BORDER,
|
|
NULL);
|
|
|
|
g_object_get (private->output,
|
|
"type", &output_type,
|
|
NULL);
|
|
|
|
if (gimp_enum_get_value (GIMP_TYPE_DYNAMICS_OUTPUT_TYPE, output_type,
|
|
NULL, NULL, &type_desc, NULL))
|
|
g_object_set (private->curve_view,
|
|
"y-axis-label", type_desc,
|
|
NULL);
|
|
|
|
gtk_widget_set_size_request (private->curve_view,
|
|
CURVE_SIZE + CURVE_BORDER * 2,
|
|
CURVE_SIZE + CURVE_BORDER * 2);
|
|
gtk_box_pack_start (GTK_BOX (editor), private->curve_view, TRUE, TRUE, 0);
|
|
gtk_widget_show (private->curve_view);
|
|
|
|
gimp_dynamics_output_editor_activate_input (editor, 0);
|
|
|
|
button = gtk_button_new_with_mnemonic (_("_Reset Curve"));
|
|
gtk_box_pack_start (GTK_BOX (editor), button, FALSE, FALSE, 0);
|
|
gtk_widget_show (button);
|
|
|
|
g_signal_connect (button, "clicked",
|
|
G_CALLBACK (gimp_dynamics_output_editor_curve_reset),
|
|
editor);
|
|
|
|
private->input_list = gtk_list_store_new (INPUT_N_COLUMNS,
|
|
G_TYPE_INT,
|
|
G_TYPE_BOOLEAN,
|
|
G_TYPE_STRING,
|
|
GEGL_TYPE_COLOR);
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (inputs); i++)
|
|
{
|
|
gboolean use_input;
|
|
GeglColor *color = gegl_color_new ("black");
|
|
|
|
g_object_get (private->output,
|
|
inputs[i].use_property, &use_input,
|
|
NULL);
|
|
|
|
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), inputs[i].color);
|
|
gtk_list_store_insert_with_values (private->input_list,
|
|
&private->input_iters[i], -1,
|
|
INPUT_COLUMN_INDEX, i,
|
|
INPUT_COLUMN_USE_INPUT, use_input,
|
|
INPUT_COLUMN_NAME, gettext (inputs[i].label),
|
|
INPUT_COLUMN_COLOR, color,
|
|
-1);
|
|
g_object_unref (color);
|
|
}
|
|
|
|
view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (private->input_list));
|
|
g_object_unref (private->input_list);
|
|
|
|
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE);
|
|
|
|
cell = gtk_cell_renderer_toggle_new ();
|
|
|
|
g_object_set (cell,
|
|
"mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
|
|
"activatable", TRUE,
|
|
NULL);
|
|
|
|
g_signal_connect (G_OBJECT (cell), "toggled",
|
|
G_CALLBACK (gimp_dynamics_output_editor_input_toggled),
|
|
editor);
|
|
|
|
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
|
|
-1, NULL,
|
|
gimp_cell_renderer_color_new (),
|
|
"color", INPUT_COLUMN_COLOR,
|
|
NULL);
|
|
|
|
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
|
|
-1, NULL,
|
|
cell,
|
|
"active", INPUT_COLUMN_USE_INPUT,
|
|
NULL);
|
|
|
|
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view),
|
|
-1, NULL,
|
|
gtk_cell_renderer_text_new (),
|
|
"text", INPUT_COLUMN_NAME,
|
|
NULL);
|
|
|
|
gtk_box_pack_start (GTK_BOX (editor), view, FALSE, FALSE, 0);
|
|
gtk_widget_show (view);
|
|
|
|
private->input_view = view;
|
|
|
|
tree_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
|
|
gtk_tree_selection_set_mode (tree_sel, GTK_SELECTION_BROWSE);
|
|
|
|
gtk_tree_selection_select_iter (tree_sel, &private->input_iters[0]);
|
|
|
|
g_signal_connect (G_OBJECT (tree_sel), "changed",
|
|
G_CALLBACK (gimp_dynamics_output_editor_input_selected),
|
|
editor);
|
|
|
|
g_signal_connect (private->output, "notify",
|
|
G_CALLBACK (gimp_dynamics_output_editor_notify_output),
|
|
editor);
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_finalize (GObject *object)
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (object);
|
|
|
|
g_clear_object (&private->output);
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_OUTPUT:
|
|
private->output = g_value_dup_object (value);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_OUTPUT:
|
|
g_value_set_object (value, private->output);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_curve_reset (GtkWidget *button,
|
|
GimpDynamicsOutputEditor *editor)
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
|
|
|
|
if (private->active_curve)
|
|
gimp_curve_reset (private->active_curve, TRUE);
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_input_selected (GtkTreeSelection *selection,
|
|
GimpDynamicsOutputEditor *editor)
|
|
{
|
|
GtkTreeModel *model;
|
|
GtkTreeIter iter;
|
|
|
|
if (gtk_tree_selection_get_selected (selection, &model, &iter))
|
|
{
|
|
gint input;
|
|
|
|
gtk_tree_model_get (model, &iter,
|
|
INPUT_COLUMN_INDEX, &input,
|
|
-1);
|
|
|
|
gimp_dynamics_output_editor_activate_input (editor, input);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_input_toggled (GtkCellRenderer *cell,
|
|
gchar *path,
|
|
GimpDynamicsOutputEditor *editor)
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
|
|
GtkTreeModel *model;
|
|
GtkTreeIter iter;
|
|
|
|
model = GTK_TREE_MODEL (private->input_list);
|
|
|
|
if (gtk_tree_model_get_iter_from_string (model, &iter, path))
|
|
{
|
|
gint input;
|
|
gboolean use;
|
|
|
|
gtk_tree_model_get (model, &iter,
|
|
INPUT_COLUMN_INDEX, &input,
|
|
INPUT_COLUMN_USE_INPUT, &use,
|
|
-1);
|
|
|
|
g_object_set (private->output,
|
|
inputs[input].use_property, ! use,
|
|
NULL);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_activate_input (GimpDynamicsOutputEditor *editor,
|
|
gint input)
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
|
|
gint i;
|
|
|
|
gimp_curve_view_set_curve (GIMP_CURVE_VIEW (private->curve_view), NULL, NULL);
|
|
gimp_curve_view_remove_all_backgrounds (GIMP_CURVE_VIEW (private->curve_view));
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (inputs); i++)
|
|
{
|
|
gboolean use_input;
|
|
GimpCurve *input_curve;
|
|
GeglColor *color = gegl_color_new (NULL);
|
|
|
|
g_object_get (private->output,
|
|
inputs[i].use_property, &use_input,
|
|
inputs[i].curve_property, &input_curve,
|
|
NULL);
|
|
|
|
if (INPUT_COLOR (i))
|
|
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), INPUT_COLOR (i));
|
|
if (input == i)
|
|
{
|
|
gimp_curve_view_set_curve (GIMP_CURVE_VIEW (private->curve_view),
|
|
input_curve,
|
|
(INPUT_COLOR (i) != NULL) ? color : NULL);
|
|
private->active_curve = input_curve;
|
|
|
|
gimp_curve_view_set_x_axis_label (GIMP_CURVE_VIEW (private->curve_view),
|
|
inputs[i].label);
|
|
}
|
|
else if (use_input)
|
|
{
|
|
gimp_curve_view_add_background (GIMP_CURVE_VIEW (private->curve_view),
|
|
input_curve,
|
|
(INPUT_COLOR (i) != NULL) ? color : NULL);
|
|
}
|
|
|
|
g_object_unref (input_curve);
|
|
g_object_unref (color);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_dynamics_output_editor_notify_output (GimpDynamicsOutput *output,
|
|
const GParamSpec *pspec,
|
|
GimpDynamicsOutputEditor *editor)
|
|
{
|
|
gint i;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (inputs); i++)
|
|
{
|
|
if (! strcmp (pspec->name, inputs[i].use_property))
|
|
{
|
|
GimpDynamicsOutputEditorPrivate *private = GET_PRIVATE (editor);
|
|
GtkTreeSelection *sel;
|
|
gboolean use_input;
|
|
GimpCurve *input_curve;
|
|
|
|
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (private->input_view));
|
|
|
|
g_object_get (output,
|
|
pspec->name, &use_input,
|
|
inputs[i].curve_property, &input_curve,
|
|
NULL);
|
|
|
|
gtk_list_store_set (private->input_list, &private->input_iters[i],
|
|
INPUT_COLUMN_USE_INPUT, use_input,
|
|
-1);
|
|
|
|
if (! gtk_tree_selection_iter_is_selected (sel,
|
|
&private->input_iters[i]))
|
|
{
|
|
if (use_input)
|
|
{
|
|
GeglColor *color = gegl_color_new (NULL);
|
|
|
|
if (INPUT_COLOR (i))
|
|
gegl_color_set_pixel (color, babl_format ("R'G'B'A double"), INPUT_COLOR (i));
|
|
|
|
gimp_curve_view_add_background (GIMP_CURVE_VIEW (private->curve_view),
|
|
input_curve,
|
|
(INPUT_COLOR (i) != NULL) ? color : NULL);
|
|
g_object_unref (color);
|
|
}
|
|
else
|
|
{
|
|
gimp_curve_view_remove_background (GIMP_CURVE_VIEW (private->curve_view),
|
|
input_curve);
|
|
}
|
|
|
|
g_object_unref (input_curve);
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* public functions */
|
|
|
|
GtkWidget *
|
|
gimp_dynamics_output_editor_new (GimpDynamicsOutput *output)
|
|
{
|
|
g_return_val_if_fail (GIMP_IS_DYNAMICS_OUTPUT (output), NULL);
|
|
|
|
return g_object_new (GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR,
|
|
"output", output,
|
|
NULL);
|
|
}
|