graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-21 20:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mishandling of the "antialias" GParamSpec. Fixes bug #521069:

Browse source 
2008-03-09  Michael Natterer  <mitch@gimp.org>

	Fix mishandling of the "antialias" GParamSpec. Fixes bug #521069:

	* app/tools/gimpselectionoptions.c: remove
	gimp_selection_options_reset() which used to set the default for
	"antialias" depending on the tool type (which is impossible since
	the antialias GParamSpec only exists once, and not once for each
	subclass).

	* app/tools/gimpforegroundselectoptions.c: override the antialias
	property here and default to FALSE.


svn path=/trunk/; revision=25077
This commit is contained in:
Michael Natterer 2008-03-09 17:43:28 +00:00 committed by Michael Natterer
parent 64317165e9
commit 5dccee41cb
3 changed files with 67 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2008-03-09 Michael Natterer <mitch@gimp.org>
Fix mishandling of the "antialias" GParamSpec. Fixes bug #521069:
* app/tools/gimpselectionoptions.c: remove
gimp_selection_options_reset() which used to set the default for
"antialias" depending on the tool type (which is impossible since
the antialias GParamSpec only exists once, and not once for each
subclass).
* app/tools/gimpforegroundselectoptions.c: override the antialias
property here and default to FALSE.
2008-03-09 Michael Natterer <mitch@gimp.org>
* app/tools/gimprectangleselecttool.[ch]

45
app/tools/gimpforegroundselectoptions.c
View file

@ -38,6 +38,7 @@
enum
{
PROP_0,
PROP_ANTIALIAS,
PROP_CONTIGUOUS,
PROP_BACKGROUND,
PROP_STROKE_WIDTH,
@ -72,20 +73,30 @@ gimp_foreground_select_options_class_init (GimpForegroundSelectOptionsClass *kla
object_class->set_property = gimp_foreground_select_options_set_property;
object_class->get_property = gimp_foreground_select_options_get_property;
/* override the antialias default value from GimpSelectionOptions */
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
"antialias",
N_("Smooth edges"),
FALSE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONTIGUOUS,
"contiguous",
_("Select a single contiguous area"),
TRUE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_BACKGROUND,
"background", NULL,
FALSE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_STROKE_WIDTH,
"stroke-width",
_("Size of the brush used for refinements"),
1, 80, 18,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_SMOOTHNESS,
"smoothness",
_("Smaller values give a more accurate "
@ -93,25 +104,30 @@ gimp_foreground_select_options_class_init (GimpForegroundSelectOptionsClass *kla
"in the selection"),
0, 8, SIOX_DEFAULT_SMOOTHNESS,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_MASK_COLOR,
"mask-color", NULL,
GIMP_TYPE_CHANNEL_TYPE,
GIMP_BLUE_CHANNEL,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_EXPANDED,
"expanded", NULL,
FALSE,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SENSITIVITY_L,
"sensitivity-l",
_("Sensitivity for brightness component"),
0.0, 10.0, SIOX_DEFAULT_SENSITIVITY_L,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SENSITIVITY_A,
"sensitivity-a",
_("Sensitivity for red/green component"),
0.0, 10.0, SIOX_DEFAULT_SENSITIVITY_A,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SENSITIVITY_B,
"sensitivity-b",
_("Sensitivity for yellow/blue component"),
@ -134,33 +150,46 @@ gimp_foreground_select_options_set_property (GObject *object,
switch (property_id)
{
case PROP_ANTIALIAS:
GIMP_SELECTION_OPTIONS (object)->antialias = g_value_get_boolean (value);
break;
case PROP_CONTIGUOUS:
options->contiguous = g_value_get_boolean (value);
break;
case PROP_BACKGROUND:
options->background = g_value_get_boolean (value);
break;
case PROP_STROKE_WIDTH:
options->stroke_width = g_value_get_int (value);
break;
case PROP_SMOOTHNESS:
options->smoothness = g_value_get_int (value);
break;
case PROP_MASK_COLOR:
options->mask_color = g_value_get_enum (value);
break;
case PROP_EXPANDED:
options->expanded = g_value_get_boolean (value);
break;
case PROP_SENSITIVITY_L:
options->sensitivity[0] = g_value_get_double (value);
break;
case PROP_SENSITIVITY_A:
options->sensitivity[1] = g_value_get_double (value);
break;
case PROP_SENSITIVITY_B:
options->sensitivity[2] = g_value_get_double (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -177,33 +206,46 @@ gimp_foreground_select_options_get_property (GObject *object,
switch (property_id)
{
case PROP_ANTIALIAS:
g_value_set_boolean (value, GIMP_SELECTION_OPTIONS (object)->antialias);
break;
case PROP_CONTIGUOUS:
g_value_set_boolean (value, options->contiguous);
break;
case PROP_BACKGROUND:
g_value_set_boolean (value, options->background);
break;
case PROP_STROKE_WIDTH:
g_value_set_int (value, options->stroke_width);
break;
case PROP_SMOOTHNESS:
g_value_set_int (value, options->smoothness);
break;
case PROP_MASK_COLOR:
g_value_set_enum (value, options->mask_color);
break;
case PROP_EXPANDED:
g_value_set_boolean (value, options->expanded);
break;
case PROP_SENSITIVITY_L:
g_value_set_double (value, options->sensitivity[0]);
break;
case PROP_SENSITIVITY_A:
g_value_set_double (value, options->sensitivity[1]);
break;
case PROP_SENSITIVITY_B:
g_value_set_double (value, options->sensitivity[2]);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -227,6 +269,9 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
gchar *title;
gint row = 0;
gtk_widget_set_sensitive (GIMP_SELECTION_OPTIONS (tool_options)->antialias_toggle,
FALSE);
/* single / multiple objects */
button = gimp_prop_check_button_new (config, "contiguous", _("Contiguous"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);

47
app/tools/gimpselectionoptions.c
View file

@ -25,15 +25,9 @@
#include "tools-types.h"
#include "config/gimpguiconfig.h"
#include "core/gimp.h"
#include "core/gimptoolinfo.h"
#include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h"
#include "gimpforegroundselecttool.h"
#include "gimpselectionoptions.h"
#include "gimptooloptions-gui.h"
@ -50,16 +44,14 @@ enum
};
static void gimp_selection_options_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_selection_options_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_selection_options_reset (GimpToolOptions *tool_options);
static void gimp_selection_options_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_selection_options_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
G_DEFINE_TYPE (GimpSelectionOptions, gimp_selection_options,
@ -71,14 +63,11 @@ G_DEFINE_TYPE (GimpSelectionOptions, gimp_selection_options,
static void
gimp_selection_options_class_init (GimpSelectionOptionsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpToolOptionsClass *options_class = GIMP_TOOL_OPTIONS_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->set_property = gimp_selection_options_set_property;
object_class->get_property = gimp_selection_options_get_property;
options_class->reset = gimp_selection_options_reset;
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPERATION,
"operation", NULL,
GIMP_TYPE_CHANNEL_OPS,
@ -171,21 +160,6 @@ gimp_selection_options_get_property (GObject *object,
}
}
static void
gimp_selection_options_reset (GimpToolOptions *tool_options)
{
GParamSpec *pspec;
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (tool_options),
"antialias");
if (pspec)
G_PARAM_SPEC_BOOLEAN (pspec)->default_value =
(tool_options->tool_info->tool_type != GIMP_TYPE_FOREGROUND_SELECT_TOOL);
GIMP_TOOL_OPTIONS_CLASS (parent_class)->reset (tool_options);
}
static const gchar *
gimp_selection_options_get_modifier (GimpChannelOps operation)
{
@ -285,9 +259,6 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
if (tool_options->tool_info->tool_type == GIMP_TYPE_FOREGROUND_SELECT_TOOL)
gtk_widget_set_sensitive (button, FALSE);
options->antialias_toggle = button;
/* the feather frame */