Reformat a bit, essentially just removed one pointless level of
2008-01-19 Martin Nordholts <martinn@svn.gnome.org> * app/tools/gimpeditselectiontool.c (gimp_edit_selection_tool_motion): Reformat a bit, essentially just removed one pointless level of indentation. svn path=/trunk/; revision=24655
This commit is contained in:
Martin Nordholts
committed by
Martin Nordholts
Martin Nordholts
parent
708f1fcaf0
commit
7a190d35fd
@ -1,3 +1,9 @@
|
|||||||
|
2008-01-19 Martin Nordholts <martinn@svn.gnome.org>
|
||||||
|
|
||||||
|
* app/tools/gimpeditselectiontool.c
|
||||||
|
(gimp_edit_selection_tool_motion): Reformat a bit, essentially
|
||||||
|
just removed one pointless level of indentation.
|
||||||
|
|
||||||
2008-01-18 Øyvind Kolås <pippin@gimp.org>
|
2008-01-18 Øyvind Kolås <pippin@gimp.org>
|
||||||
|
|
||||||
Removed copies of GEGL headers from GIMP source, depend on installed
|
Removed copies of GEGL headers from GIMP source, depend on installed
|
||||||
|
|||||||
@ -543,6 +543,7 @@ gimp_edit_selection_tool_motion (GimpTool *tool,
|
|||||||
GimpItem *active_item;
|
GimpItem *active_item;
|
||||||
gint off_x, off_y;
|
gint off_x, off_y;
|
||||||
gdouble motion_x, motion_y;
|
gdouble motion_x, motion_y;
|
||||||
|
gint x, y;
|
||||||
|
|
||||||
gdk_flush ();
|
gdk_flush ();
|
||||||
|
|
||||||
@ -568,120 +569,111 @@ gimp_edit_selection_tool_motion (GimpTool *tool,
|
|||||||
gimp_edit_selection_tool_calc_coords (edit_select,
|
gimp_edit_selection_tool_calc_coords (edit_select,
|
||||||
motion_x,
|
motion_x,
|
||||||
motion_y);
|
motion_y);
|
||||||
|
x = edit_select->x;
|
||||||
|
y = edit_select->y;
|
||||||
|
|
||||||
/******************************************* adam's live move *******/
|
/* if there has been movement, move the selection */
|
||||||
/********************************************************************/
|
if (edit_select->origx != x || edit_select->origy != y)
|
||||||
{
|
{
|
||||||
gint x, y;
|
gint xoffset;
|
||||||
|
gint yoffset;
|
||||||
|
GError *error = NULL;
|
||||||
|
|
||||||
x = edit_select->x;
|
xoffset = x - edit_select->origx;
|
||||||
y = edit_select->y;
|
yoffset = y - edit_select->origy;
|
||||||
|
|
||||||
/* if there has been movement, move the selection */
|
edit_select->cumlx += xoffset;
|
||||||
if (edit_select->origx != x || edit_select->origy != y)
|
edit_select->cumly += yoffset;
|
||||||
{
|
|
||||||
gint xoffset;
|
|
||||||
gint yoffset;
|
|
||||||
GError *error = NULL;
|
|
||||||
|
|
||||||
xoffset = x - edit_select->origx;
|
switch (edit_select->edit_mode)
|
||||||
yoffset = y - edit_select->origy;
|
{
|
||||||
|
case GIMP_TRANSLATE_MODE_LAYER_MASK:
|
||||||
|
case GIMP_TRANSLATE_MODE_MASK:
|
||||||
|
/* we don't do the actual edit selection move here. */
|
||||||
|
edit_select->origx = x;
|
||||||
|
edit_select->origy = y;
|
||||||
|
break;
|
||||||
|
|
||||||
edit_select->cumlx += xoffset;
|
case GIMP_TRANSLATE_MODE_VECTORS:
|
||||||
edit_select->cumly += yoffset;
|
case GIMP_TRANSLATE_MODE_CHANNEL:
|
||||||
|
edit_select->origx = x;
|
||||||
|
edit_select->origy = y;
|
||||||
|
|
||||||
switch (edit_select->edit_mode)
|
/* fallthru */
|
||||||
{
|
|
||||||
case GIMP_TRANSLATE_MODE_LAYER_MASK:
|
|
||||||
case GIMP_TRANSLATE_MODE_MASK:
|
|
||||||
/* we don't do the actual edit selection move here. */
|
|
||||||
edit_select->origx = x;
|
|
||||||
edit_select->origy = y;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GIMP_TRANSLATE_MODE_VECTORS:
|
case GIMP_TRANSLATE_MODE_LAYER:
|
||||||
case GIMP_TRANSLATE_MODE_CHANNEL:
|
/* for CHANNEL_TRANSLATE, only translate the linked layers
|
||||||
edit_select->origx = x;
|
* and vectors on-the-fly, the channel is translated
|
||||||
edit_select->origy = y;
|
* on button_release.
|
||||||
|
*/
|
||||||
/* fallthru */
|
if (edit_select->edit_mode != GIMP_TRANSLATE_MODE_CHANNEL)
|
||||||
|
|
||||||
case GIMP_TRANSLATE_MODE_LAYER:
|
|
||||||
/* for CHANNEL_TRANSLATE, only translate the linked layers
|
|
||||||
* and vectors on-the-fly, the channel is translated
|
|
||||||
* on button_release.
|
|
||||||
*/
|
|
||||||
if (edit_select->edit_mode != GIMP_TRANSLATE_MODE_CHANNEL)
|
|
||||||
gimp_item_translate (active_item, xoffset, yoffset,
|
|
||||||
edit_select->first_move);
|
|
||||||
|
|
||||||
if (gimp_item_get_linked (active_item))
|
|
||||||
{
|
|
||||||
/* translate all linked layers & vectors as well */
|
|
||||||
|
|
||||||
GList *linked;
|
|
||||||
|
|
||||||
linked = gimp_image_item_list_get_list (display->image,
|
|
||||||
active_item,
|
|
||||||
GIMP_ITEM_TYPE_LAYERS |
|
|
||||||
GIMP_ITEM_TYPE_VECTORS,
|
|
||||||
GIMP_ITEM_SET_LINKED);
|
|
||||||
|
|
||||||
gimp_image_item_list_translate (display->image,
|
|
||||||
linked,
|
|
||||||
xoffset, yoffset,
|
|
||||||
edit_select->first_move);
|
|
||||||
|
|
||||||
g_list_free (linked);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
|
|
||||||
case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
|
|
||||||
if (! gimp_selection_float (gimp_image_get_mask (display->image),
|
|
||||||
GIMP_DRAWABLE (active_item),
|
|
||||||
gimp_get_user_context (display->image->gimp),
|
|
||||||
edit_select->edit_mode ==
|
|
||||||
GIMP_TRANSLATE_MODE_MASK_TO_LAYER,
|
|
||||||
0, 0, &error))
|
|
||||||
{
|
|
||||||
/* no region to float, abort safely */
|
|
||||||
gimp_message (display->image->gimp, G_OBJECT (display),
|
|
||||||
GIMP_MESSAGE_WARNING,
|
|
||||||
"%s", error->message);
|
|
||||||
g_clear_error (&error);
|
|
||||||
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
edit_select->origx -= edit_select->x1;
|
|
||||||
edit_select->origy -= edit_select->y1;
|
|
||||||
edit_select->x2 -= edit_select->x1;
|
|
||||||
edit_select->y2 -= edit_select->y1;
|
|
||||||
edit_select->x1 = 0;
|
|
||||||
edit_select->y1 = 0;
|
|
||||||
|
|
||||||
edit_select->edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
|
|
||||||
|
|
||||||
active_item =
|
|
||||||
GIMP_ITEM (gimp_image_get_active_drawable (display->image));
|
|
||||||
|
|
||||||
/* fall through */
|
|
||||||
|
|
||||||
case GIMP_TRANSLATE_MODE_FLOATING_SEL:
|
|
||||||
gimp_item_translate (active_item, xoffset, yoffset,
|
gimp_item_translate (active_item, xoffset, yoffset,
|
||||||
edit_select->first_move);
|
edit_select->first_move);
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
edit_select->first_move = FALSE;
|
if (gimp_item_get_linked (active_item))
|
||||||
}
|
{
|
||||||
|
/* translate all linked layers & vectors as well */
|
||||||
|
|
||||||
gimp_projection_flush (display->image->projection);
|
GList *linked;
|
||||||
}
|
|
||||||
/********************************************************************/
|
linked = gimp_image_item_list_get_list (display->image,
|
||||||
/********************************************************************/
|
active_item,
|
||||||
|
GIMP_ITEM_TYPE_LAYERS |
|
||||||
|
GIMP_ITEM_TYPE_VECTORS,
|
||||||
|
GIMP_ITEM_SET_LINKED);
|
||||||
|
|
||||||
|
gimp_image_item_list_translate (display->image,
|
||||||
|
linked,
|
||||||
|
xoffset, yoffset,
|
||||||
|
edit_select->first_move);
|
||||||
|
|
||||||
|
g_list_free (linked);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case GIMP_TRANSLATE_MODE_MASK_TO_LAYER:
|
||||||
|
case GIMP_TRANSLATE_MODE_MASK_COPY_TO_LAYER:
|
||||||
|
if (! gimp_selection_float (gimp_image_get_mask (display->image),
|
||||||
|
GIMP_DRAWABLE (active_item),
|
||||||
|
gimp_get_user_context (display->image->gimp),
|
||||||
|
edit_select->edit_mode ==
|
||||||
|
GIMP_TRANSLATE_MODE_MASK_TO_LAYER,
|
||||||
|
0, 0, &error))
|
||||||
|
{
|
||||||
|
/* no region to float, abort safely */
|
||||||
|
gimp_message (display->image->gimp, G_OBJECT (display),
|
||||||
|
GIMP_MESSAGE_WARNING,
|
||||||
|
"%s", error->message);
|
||||||
|
g_clear_error (&error);
|
||||||
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
edit_select->origx -= edit_select->x1;
|
||||||
|
edit_select->origy -= edit_select->y1;
|
||||||
|
edit_select->x2 -= edit_select->x1;
|
||||||
|
edit_select->y2 -= edit_select->y1;
|
||||||
|
edit_select->x1 = 0;
|
||||||
|
edit_select->y1 = 0;
|
||||||
|
|
||||||
|
edit_select->edit_mode = GIMP_TRANSLATE_MODE_FLOATING_SEL;
|
||||||
|
|
||||||
|
active_item =
|
||||||
|
GIMP_ITEM (gimp_image_get_active_drawable (display->image));
|
||||||
|
|
||||||
|
/* fall through */
|
||||||
|
|
||||||
|
case GIMP_TRANSLATE_MODE_FLOATING_SEL:
|
||||||
|
gimp_item_translate (active_item, xoffset, yoffset,
|
||||||
|
edit_select->first_move);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
edit_select->first_move = FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
gimp_projection_flush (display->image->projection);
|
||||||
|
|
||||||
gimp_tool_pop_status (tool, display);
|
gimp_tool_pop_status (tool, display);
|
||||||
gimp_tool_push_status_coords (tool, display,
|
gimp_tool_push_status_coords (tool, display,
|
||||||
|
|||||||
Reference in New Issue
Block a user