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

Restrict to horizontal/vertical blend when modifiers are pressed. 

Mon Jul 26 20:11:01 MEST 1999  Sven Neumann <sven@gimp.org>

        * app/blend.c: Restrict to horizontal/vertical blend when modifiers
        are pressed.

--Sven
This commit is contained in:
MEST 1999 Sven Neumann 1999-07-26 18:13:10 +00:00 committed by Sven Neumann
parent 4e12032601
commit 33167e4c37
5 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jul 26 20:11:01 MEST 1999 Sven Neumann <sven@gimp.org>
* app/blend.c: Restrict to horizontal/vertical blend when modifiers
are pressed.
1999-07-26 Tuomas Kuosmanen <tigert@gimp.org>
* pixmaps/topath.xpm

21
app/blend.c
View File

@ -633,6 +633,27 @@ blend_motion (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y,
&blend_tool->endx, &blend_tool->endy, FALSE, 1);
/* restrict to horizontal/vertical blend, if modifiers are pressed */
if (mevent->state & GDK_MOD1_MASK)
{
if (mevent->state & GDK_CONTROL_MASK)
{
double dx, dy;
dx = blend_tool->endx - blend_tool->startx;
dy = blend_tool->endy - blend_tool->starty;
blend_tool->endx = blend_tool->endx +
((dx < 0) && (dy > 0) ? - MAX (dx, dy) : MAX (dx, dy));
blend_tool->endy = blend_tool->endy +
((dy < 0) && (dx > 0) ? - MAX (dx, dy) : MAX (dx, dy));
}
else
blend_tool->endx = blend_tool->startx;
}
else if (mevent->state & GDK_CONTROL_MASK)
blend_tool->endy = blend_tool->starty;
gtk_statusbar_pop (GTK_STATUSBAR (gdisp->statusbar), blend_tool->context_id);
if (gdisp->dot_for_dot)
{

21
app/core/gimpdrawable-blend.c
View File

@ -633,6 +633,27 @@ blend_motion (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y,
&blend_tool->endx, &blend_tool->endy, FALSE, 1);
/* restrict to horizontal/vertical blend, if modifiers are pressed */
if (mevent->state & GDK_MOD1_MASK)
{
if (mevent->state & GDK_CONTROL_MASK)
{
double dx, dy;
dx = blend_tool->endx - blend_tool->startx;
dy = blend_tool->endy - blend_tool->starty;
blend_tool->endx = blend_tool->endx +
((dx < 0) && (dy > 0) ? - MAX (dx, dy) : MAX (dx, dy));
blend_tool->endy = blend_tool->endy +
((dy < 0) && (dx > 0) ? - MAX (dx, dy) : MAX (dx, dy));
}
else
blend_tool->endx = blend_tool->startx;
}
else if (mevent->state & GDK_CONTROL_MASK)
blend_tool->endy = blend_tool->starty;
gtk_statusbar_pop (GTK_STATUSBAR (gdisp->statusbar), blend_tool->context_id);
if (gdisp->dot_for_dot)
{

21
app/tools/blend.c
View File

@ -633,6 +633,27 @@ blend_motion (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y,
&blend_tool->endx, &blend_tool->endy, FALSE, 1);
/* restrict to horizontal/vertical blend, if modifiers are pressed */
if (mevent->state & GDK_MOD1_MASK)
{
if (mevent->state & GDK_CONTROL_MASK)
{
double dx, dy;
dx = blend_tool->endx - blend_tool->startx;
dy = blend_tool->endy - blend_tool->starty;
blend_tool->endx = blend_tool->endx +
((dx < 0) && (dy > 0) ? - MAX (dx, dy) : MAX (dx, dy));
blend_tool->endy = blend_tool->endy +
((dy < 0) && (dx > 0) ? - MAX (dx, dy) : MAX (dx, dy));
}
else
blend_tool->endx = blend_tool->startx;
}
else if (mevent->state & GDK_CONTROL_MASK)
blend_tool->endy = blend_tool->starty;
gtk_statusbar_pop (GTK_STATUSBAR (gdisp->statusbar), blend_tool->context_id);
if (gdisp->dot_for_dot)
{

21
app/tools/gimpblendtool.c
View File

@ -633,6 +633,27 @@ blend_motion (Tool *tool,
gdisplay_untransform_coords (gdisp, mevent->x, mevent->y,
&blend_tool->endx, &blend_tool->endy, FALSE, 1);
/* restrict to horizontal/vertical blend, if modifiers are pressed */
if (mevent->state & GDK_MOD1_MASK)
{
if (mevent->state & GDK_CONTROL_MASK)
{
double dx, dy;
dx = blend_tool->endx - blend_tool->startx;
dy = blend_tool->endy - blend_tool->starty;
blend_tool->endx = blend_tool->endx +
((dx < 0) && (dy > 0) ? - MAX (dx, dy) : MAX (dx, dy));
blend_tool->endy = blend_tool->endy +
((dy < 0) && (dx > 0) ? - MAX (dx, dy) : MAX (dx, dy));
}
else
blend_tool->endx = blend_tool->startx;
}
else if (mevent->state & GDK_CONTROL_MASK)
blend_tool->endy = blend_tool->starty;
gtk_statusbar_pop (GTK_STATUSBAR (gdisp->statusbar), blend_tool->context_id);
if (gdisp->dot_for_dot)
{