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

Always update the drawable when converting a floating selection to a layer 

Fri Mar 27 13:41:55 EST 1998 Matthew Wilson <msw@gimp.org>

	* app/floating_sel.c: Always update the drawable when converting
	a floating selection to a layer

--Matt
This commit is contained in:
EST 1998 Matthew Wilson 1998-03-27 21:21:57 +00:00 committed by Matt Wilson
parent 792728eb13
commit 6daf14262c
5 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Mar 27 13:41:55 EST 1998 Matthew Wilson <msw@gimp.org>
* app/floating_sel.c: Always update the drawable when converting
a floating selection to a layer
Fri Mar 27 11:41:30 EST 1998 Adrian Likins <adrian@gimp.org>
*plug-ins/palette/*: added the save palette plugin

22
app/core/gimplayer-floating-sel.c
View File

@ -158,7 +158,6 @@ floating_sel_to_layer (Layer *layer)
FStoLayerUndo *fsu;
int off_x, off_y;
int width, height;
int update = FALSE;
GImage *gimage;
@ -182,10 +181,6 @@ floating_sel_to_layer (Layer *layer)
drawable_offsets (layer->fs.drawable, &off_x, &off_y);
width = drawable_width (layer->fs.drawable);
height = drawable_height (layer->fs.drawable);
update = (update || ((GIMP_DRAWABLE(layer)->offset_x < off_x) ||
(GIMP_DRAWABLE(layer)->offset_y < off_y) ||
(GIMP_DRAWABLE(layer)->offset_x + GIMP_DRAWABLE(layer)->width > off_x + width) ||
(GIMP_DRAWABLE(layer)->offset_y + GIMP_DRAWABLE(layer)->height > off_y + height)) ? TRUE : FALSE);
/* update the fs drawable--this updates the gimage composite preview
* as well as the underlying drawable's
@ -205,13 +200,18 @@ floating_sel_to_layer (Layer *layer)
/* Set pointers */
layer->fs.drawable = NULL;
gimage->floating_sel = NULL;
GIMP_DRAWABLE(layer)->visible = TRUE;
/* if the floating selection exceeds the attached layer's extents, update the new layer */
if (update)
drawable_update (GIMP_DRAWABLE(layer), 0, 0, GIMP_DRAWABLE(layer)->width, GIMP_DRAWABLE(layer)->height);
/* otherwise, just update the preview, because the image is valid as is */
else
drawable_invalidate_preview (GIMP_DRAWABLE(layer));
/* if the floating selection exceeds the attached layer's extents,
update the new layer */
/* I don't think that the preview is ever valid as is, since the layer
will be added on top of the others. Revert this if I'm wrong.
msw@gimp.org
*/
drawable_update (GIMP_DRAWABLE(layer), 0, 0,
GIMP_DRAWABLE(layer)->width, GIMP_DRAWABLE(layer)->height);
}
void

22
app/floating_sel.c
View File

@ -158,7 +158,6 @@ floating_sel_to_layer (Layer *layer)
FStoLayerUndo *fsu;
int off_x, off_y;
int width, height;
int update = FALSE;
GImage *gimage;
@ -182,10 +181,6 @@ floating_sel_to_layer (Layer *layer)
drawable_offsets (layer->fs.drawable, &off_x, &off_y);
width = drawable_width (layer->fs.drawable);
height = drawable_height (layer->fs.drawable);
update = (update || ((GIMP_DRAWABLE(layer)->offset_x < off_x) ||
(GIMP_DRAWABLE(layer)->offset_y < off_y) ||
(GIMP_DRAWABLE(layer)->offset_x + GIMP_DRAWABLE(layer)->width > off_x + width) ||
(GIMP_DRAWABLE(layer)->offset_y + GIMP_DRAWABLE(layer)->height > off_y + height)) ? TRUE : FALSE);
/* update the fs drawable--this updates the gimage composite preview
* as well as the underlying drawable's
@ -205,13 +200,18 @@ floating_sel_to_layer (Layer *layer)
/* Set pointers */
layer->fs.drawable = NULL;
gimage->floating_sel = NULL;
GIMP_DRAWABLE(layer)->visible = TRUE;
/* if the floating selection exceeds the attached layer's extents, update the new layer */
if (update)
drawable_update (GIMP_DRAWABLE(layer), 0, 0, GIMP_DRAWABLE(layer)->width, GIMP_DRAWABLE(layer)->height);
/* otherwise, just update the preview, because the image is valid as is */
else
drawable_invalidate_preview (GIMP_DRAWABLE(layer));
/* if the floating selection exceeds the attached layer's extents,
update the new layer */
/* I don't think that the preview is ever valid as is, since the layer
will be added on top of the others. Revert this if I'm wrong.
msw@gimp.org
*/
drawable_update (GIMP_DRAWABLE(layer), 0, 0,
GIMP_DRAWABLE(layer)->width, GIMP_DRAWABLE(layer)->height);
}
void

1
app/gui/layers-dialog.c
View File

@ -1516,6 +1516,7 @@ layers_dialog_new_layer_callback (GtkWidget *w,
if ((layer = gimage_floating_sel (gimage)))
{
floating_sel_to_layer (layer);
gdisplays_flush ();
}
else

1
app/layers_dialog.c
View File

@ -1516,6 +1516,7 @@ layers_dialog_new_layer_callback (GtkWidget *w,
if ((layer = gimage_floating_sel (gimage)))
{
floating_sel_to_layer (layer);
gdisplays_flush ();
}
else