dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

access the GimpCropOptions structure directly to read the "layer_only" 

2007-03-31  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpcroptool.c: access the GimpCropOptions structure
	directly to read the "layer_only" option (don't use g_object_get),
	some code cleanup.


svn path=/trunk/; revision=22207
This commit is contained in:
Michael Natterer 2007-03-31 16:07:05 +00:00 committed by Michael Natterer
parent 6e422b5211
commit 58bea5b1b6
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-03-31 Michael Natterer <mitch@gimp.org>
* app/tools/gimpcroptool.c: access the GimpCropOptions structure
directly to read the "layer_only" option (don't use g_object_get),
some code cleanup.
2007-03-31 Michael Natterer <mitch@gimp.org>
Statusbar messages shouldn't depend on the emission of unrelated

45
app/tools/gimpcroptool.c
View File

@ -140,13 +140,10 @@ gimp_crop_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *iface)
static void
gimp_crop_tool_init (GimpCropTool *crop_tool)
{
GimpTool *tool = GIMP_TOOL (crop_tool);
GimpRectangleTool *rect_tool = GIMP_RECTANGLE_TOOL (crop_tool);
GimpTool *tool = GIMP_TOOL (crop_tool);
gimp_tool_control_set_wants_click (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_CROP);
gimp_rectangle_tool_set_constraint (rect_tool, TRUE);
}
static GObject *
@ -154,32 +151,23 @@ gimp_crop_tool_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
{
GObject *object;
GimpRectangleTool *rectangle;
GimpRectangleOptions *options;
gboolean layer_only;
GObject *object;
GimpCropOptions *options;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
gimp_rectangle_tool_constructor (object);
rectangle = GIMP_RECTANGLE_TOOL (object);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (object);
options = GIMP_CROP_TOOL_GET_OPTIONS (object);
g_signal_connect_object (options, "notify::layer-only",
G_CALLBACK (gimp_crop_tool_notify_layer_only),
object, 0);
g_object_get (options,
"layer-only", &layer_only,
NULL);
if (layer_only)
gimp_rectangle_tool_set_constraint (rectangle,
GIMP_RECTANGLE_CONSTRAIN_DRAWABLE);
else
gimp_rectangle_tool_set_constraint (rectangle,
GIMP_RECTANGLE_CONSTRAIN_IMAGE);
gimp_rectangle_tool_set_constraint (GIMP_RECTANGLE_TOOL (object),
options->layer_only ?
GIMP_RECTANGLE_CONSTRAIN_DRAWABLE :
GIMP_RECTANGLE_CONSTRAIN_IMAGE);
return object;
}
@ -308,17 +296,8 @@ gimp_crop_tool_notify_layer_only (GimpCropOptions *options,
GParamSpec *pspec,
GimpTool *tool)
{
GimpRectangleTool *rectangle = GIMP_RECTANGLE_TOOL (tool);
gboolean layer_only;
g_object_get (options,
"layer-only", &layer_only,
NULL);
if (layer_only)
gimp_rectangle_tool_set_constraint (rectangle,
GIMP_RECTANGLE_CONSTRAIN_DRAWABLE);
else
gimp_rectangle_tool_set_constraint (rectangle,
GIMP_RECTANGLE_CONSTRAIN_IMAGE);
gimp_rectangle_tool_set_constraint (GIMP_RECTANGLE_TOOL (tool),
options->layer_only ?
GIMP_RECTANGLE_CONSTRAIN_DRAWABLE :
GIMP_RECTANGLE_CONSTRAIN_IMAGE);
}