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

fixed bug #6092 

--Sven
This commit is contained in:
Sven Neumann 2000-02-10 14:43:51 +00:00
parent 630fe55d17
commit 1b0928ec7b
4 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Feb 10 15:43:02 CET 2000 Sven Neumann <sven@gimp.org>
* app/edit_selection.c: fixed bug #6092.
Thu Feb 10 15:20:13 CET 2000 Sven Neumann <sven@gimp.org>
* app/edit_selection.c: Finally moved selections snap to the

29
app/edit_selection.c
View File

@ -354,11 +354,17 @@ edit_selection_motion (Tool *tool,
break;
case MaskToLayerTranslate:
gimage_mask_float (gdisp->gimage,
gimage_active_drawable (gdisp->gimage),
0, 0);
if (!gimage_mask_float (gdisp->gimage,
gimage_active_drawable (gdisp->gimage),
0, 0))
{
/* no region to float, abort safely */
draw_core_resume (edit_select.core, tool);
return;
}
/* this is always the first move, since we switch to FloatingSelTranslate */
/* this is always the first move, since we switch to
FloatingSelTranslate when finished here */
gimp_image_undo_freeze (gdisp->gimage);
edit_select.first_move = FALSE;
@ -443,19 +449,15 @@ edit_selection_draw (Tool *tool)
gdisp = (GDisplay *) tool->gdisp_ptr;
select = gdisp->select;
if (edit_select.edit_type == FloatingSelTranslate ||
edit_select.edit_type == MaskTranslate)
{
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
}
switch (edit_select.edit_type)
{
case MaskTranslate:
layer = gimage_get_active_layer (gdisp->gimage);
floating_sel = layer_is_floating_sel (layer);
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
/* offset the current selection */
seg = select->segs_in;
for (i = 0; i < select->num_segs_in; i++)
@ -552,7 +554,10 @@ edit_selection_draw (Tool *tool)
break;
case FloatingSelTranslate:
seg = select->segs_in;
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
seg = select->segs_in;
for (i = 0; i < select->num_segs_in; i++)
{
seg->x1 += diff_x;

29
app/tools/edit_selection.c
View File

@ -354,11 +354,17 @@ edit_selection_motion (Tool *tool,
break;
case MaskToLayerTranslate:
gimage_mask_float (gdisp->gimage,
gimage_active_drawable (gdisp->gimage),
0, 0);
if (!gimage_mask_float (gdisp->gimage,
gimage_active_drawable (gdisp->gimage),
0, 0))
{
/* no region to float, abort safely */
draw_core_resume (edit_select.core, tool);
return;
}
/* this is always the first move, since we switch to FloatingSelTranslate */
/* this is always the first move, since we switch to
FloatingSelTranslate when finished here */
gimp_image_undo_freeze (gdisp->gimage);
edit_select.first_move = FALSE;
@ -443,19 +449,15 @@ edit_selection_draw (Tool *tool)
gdisp = (GDisplay *) tool->gdisp_ptr;
select = gdisp->select;
if (edit_select.edit_type == FloatingSelTranslate ||
edit_select.edit_type == MaskTranslate)
{
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
}
switch (edit_select.edit_type)
{
case MaskTranslate:
layer = gimage_get_active_layer (gdisp->gimage);
floating_sel = layer_is_floating_sel (layer);
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
/* offset the current selection */
seg = select->segs_in;
for (i = 0; i < select->num_segs_in; i++)
@ -552,7 +554,10 @@ edit_selection_draw (Tool *tool)
break;
case FloatingSelTranslate:
seg = select->segs_in;
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
seg = select->segs_in;
for (i = 0; i < select->num_segs_in; i++)
{
seg->x1 += diff_x;

29
app/tools/gimpeditselectiontool.c
View File

@ -354,11 +354,17 @@ edit_selection_motion (Tool *tool,
break;
case MaskToLayerTranslate:
gimage_mask_float (gdisp->gimage,
gimage_active_drawable (gdisp->gimage),
0, 0);
if (!gimage_mask_float (gdisp->gimage,
gimage_active_drawable (gdisp->gimage),
0, 0))
{
/* no region to float, abort safely */
draw_core_resume (edit_select.core, tool);
return;
}
/* this is always the first move, since we switch to FloatingSelTranslate */
/* this is always the first move, since we switch to
FloatingSelTranslate when finished here */
gimp_image_undo_freeze (gdisp->gimage);
edit_select.first_move = FALSE;
@ -443,19 +449,15 @@ edit_selection_draw (Tool *tool)
gdisp = (GDisplay *) tool->gdisp_ptr;
select = gdisp->select;
if (edit_select.edit_type == FloatingSelTranslate ||
edit_select.edit_type == MaskTranslate)
{
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
}
switch (edit_select.edit_type)
{
case MaskTranslate:
layer = gimage_get_active_layer (gdisp->gimage);
floating_sel = layer_is_floating_sel (layer);
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
/* offset the current selection */
seg = select->segs_in;
for (i = 0; i < select->num_segs_in; i++)
@ -552,7 +554,10 @@ edit_selection_draw (Tool *tool)
break;
case FloatingSelTranslate:
seg = select->segs_in;
diff_x = SCALEX (gdisp, edit_select.cumlx);
diff_y = SCALEY (gdisp, edit_select.cumly);
seg = select->segs_in;
for (i = 0; i < select->num_segs_in; i++)
{
seg->x1 += diff_x;