callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed minor bugs, tweaked behavior if no selection to be consistant.

Browse Source
This commit is contained in:
Seth Burgess
1999-07-10 04:40:51 +00:00
parent 1f148073c5
commit a513b0d10e
8 changed files with 95 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jul 9 23:35 CST 1999 Seth Burgess <sjburges@gimp.org>
* app/qmask.c : fixed some small lil' bugs, made no selection not
automatically select all. More features later.
1999-07-10 Michael Natterer <mitschel@cs.tu-berlin.de> 1999-07-10 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/disp_callbacks.c (gdisplay_canvas_events): added wheelmouse * app/disp_callbacks.c (gdisplay_canvas_events): added wheelmouse

16
app/actions/qmask-commands.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();

16
app/actions/quick-mask-commands.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();

16
app/core/gimpimage-qmask.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();

16
app/core/gimpimage-quick-mask.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();

16
app/display/gimpdisplayshell-qmask.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();

16
app/gui/qmask-commands.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();

16
app/qmask.c
View File

@ -94,7 +94,9 @@ if (gdisp)
gdisp->gimage->qmask_state = 0; gdisp->gimage->qmask_state = 0;
gdisplays_flush (); gdisplays_flush ();
} }
else
gdisp->gimage->qmask_state = 0;
undo_push_group_end (gimg); undo_push_group_end (gimg);
} }
} }
@ -105,6 +107,7 @@ qmask_activate(GtkWidget *w,
{ {
GimpImage *gimg; GimpImage *gimg;
GimpChannel *gmask; GimpChannel *gmask;
GimpLayer *layer;
unsigned char color[3] = {255,0,0}; unsigned char color[3] = {255,0,0};
double opacity = 50; double opacity = 50;
@ -122,7 +125,13 @@ if (gdisp)
return; /* do nothing if Qmask already exists */ return; /* do nothing if Qmask already exists */
undo_push_group_start (gimg, QMASK_UNDO); undo_push_group_start (gimg, QMASK_UNDO);
if (gimage_mask_is_empty(gimg)) if (gimage_mask_is_empty(gimg))
{ /* if no selection */ {
if ((layer = gimage_floating_sel (gimg)))
{
floating_sel_to_layer (layer);
printf ("111111!!!11!\n");
}
/* if no selection */
gmask = channel_new(gimg, gmask = channel_new(gimg,
gimg->width, gimg->width,
gimg->height, gimg->height,
@ -130,7 +139,8 @@ if (gdisp)
(int)(255*opacity)/100, (int)(255*opacity)/100,
color); color);
gimp_image_add_channel (gimg, gmask, 0); gimp_image_add_channel (gimg, gmask, 0);
edit_clear(gimg,GIMP_DRAWABLE(gmask)); gimp_drawable_fill (GIMP_DRAWABLE(gmask), 0, 0, 0, 0);
/* edit_clear(gimg,GIMP_DRAWABLE(gmask)); */
undo_push_qmask(gimg,0); undo_push_qmask(gimg,0);
gdisp->gimage->qmask_state = 1; gdisp->gimage->qmask_state = 1;
gdisplays_flush(); gdisplays_flush();