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

use pointer coordinates from the passed event instead of calling 

2008-10-20  Sven Neumann  <sven@sven>

	* plug-ins/common/bump-map.c (dialog_preview_events): use 
pointer
	coordinates from the passed event instead of calling
	gtk_widget_get_pointer().


svn path=/trunk/; revision=27339
This commit is contained in:
Sven Neumann 2008-10-20 13:27:00 +00:00 committed by Sven Neumann
parent 262ca5d4c9
commit 236b1ba900
2 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-10-20 Sven Neumann <sven@sven>
* plug-ins/common/bump-map.c (dialog_preview_events): use pointer
coordinates from the passed event instead of calling
gtk_widget_get_pointer().
2008-10-20 Sven Neumann <sven@sven>
* plug-ins/common/iwarp.c: set the OK and Reset button insensitive

111
plug-ins/common/bump-map.c
View File

@ -144,7 +144,7 @@ static void bumpmap_convert_row (guchar *row,
static gboolean bumpmap_dialog (void);
static void dialog_new_bumpmap (gboolean init_offsets);
static void dialog_update_preview (GimpPreview *preview);
static gint dialog_preview_events (GtkWidget *area,
static gboolean dialog_preview_events (GtkWidget *area,
GdkEvent *event,
GimpPreview *preview);
static void dialog_get_rows (GimpPixelRgn *pr,
@ -1001,38 +1001,34 @@ bumpmap_dialog (void)
return run;
}
static gint
static gboolean
dialog_preview_events (GtkWidget *area,
GdkEvent *event,
GimpPreview *preview)
{
gint x, y;
gint dx, dy;
GdkEventButton *bevent;
gtk_widget_get_pointer (area, &x, &y);
bevent = (GdkEventButton *) event;
switch (event->type)
{
case GDK_BUTTON_PRESS:
switch (bevent->button)
{
case 2:
bmint.drag_mode = DRAG_BUMPMAP;
break;
{
GdkEventButton *bevent = (GdkEventButton *) event;
default:
return FALSE;
}
switch (bevent->button)
{
case 2:
bmint.drag_mode = DRAG_BUMPMAP;
break;
bmint.mouse_x = x;
bmint.mouse_y = y;
default:
return FALSE;
}
gtk_grab_add (area);
bmint.mouse_x = bevent->x;
bmint.mouse_y = bevent->y;
return TRUE;
gtk_grab_add (area);
return TRUE;
}
break;
case GDK_BUTTON_RELEASE:
@ -1044,50 +1040,53 @@ dialog_preview_events (GtkWidget *area,
return TRUE;
}
break;
case GDK_MOTION_NOTIFY:
dx = x - bmint.mouse_x;
dy = y - bmint.mouse_y;
{
GdkEventMotion *mevent = (GdkEventMotion *) event;
gint dx = mevent->x - bmint.mouse_x;
gint dy = mevent->y - bmint.mouse_y;
bmint.mouse_x = x;
bmint.mouse_y = y;
bmint.mouse_x = mevent->x;
bmint.mouse_y = mevent->y;
if ((dx == 0) && (dy == 0))
break;
gdk_event_request_motions (mevent);
switch (bmint.drag_mode)
{
case DRAG_BUMPMAP:
bmvals.xofs = CLAMP (bmvals.xofs - dx, -1000, 1000);
g_signal_handlers_block_by_func (bmint.offset_adj_x,
gimp_int_adjustment_update,
&bmvals.xofs);
gtk_adjustment_set_value (GTK_ADJUSTMENT (bmint.offset_adj_x),
bmvals.xofs);
g_signal_handlers_unblock_by_func (bmint.offset_adj_x,
gimp_int_adjustment_update,
&bmvals.xofs);
bmvals.yofs = CLAMP (bmvals.yofs - dy, -1000, 1000);
g_signal_handlers_block_by_func (bmint.offset_adj_y,
gimp_int_adjustment_update,
&bmvals.yofs);
gtk_adjustment_set_value (GTK_ADJUSTMENT (bmint.offset_adj_y),
bmvals.yofs);
g_signal_handlers_unblock_by_func (bmint.offset_adj_y,
gimp_int_adjustment_update,
&bmvals.yofs);
if ((dx == 0) && (dy == 0))
break;
default:
return FALSE;
}
switch (bmint.drag_mode)
{
case DRAG_BUMPMAP:
bmvals.xofs = CLAMP (bmvals.xofs - dx, -1000, 1000);
g_signal_handlers_block_by_func (bmint.offset_adj_x,
gimp_int_adjustment_update,
&bmvals.xofs);
gtk_adjustment_set_value (GTK_ADJUSTMENT (bmint.offset_adj_x),
bmvals.xofs);
g_signal_handlers_unblock_by_func (bmint.offset_adj_x,
gimp_int_adjustment_update,
&bmvals.xofs);
gimp_preview_invalidate (preview);
bmvals.yofs = CLAMP (bmvals.yofs - dy, -1000, 1000);
g_signal_handlers_block_by_func (bmint.offset_adj_y,
gimp_int_adjustment_update,
&bmvals.yofs);
gtk_adjustment_set_value (GTK_ADJUSTMENT (bmint.offset_adj_y),
bmvals.yofs);
g_signal_handlers_unblock_by_func (bmint.offset_adj_y,
gimp_int_adjustment_update,
&bmvals.yofs);
break;
return TRUE;
default:
return FALSE;
}
gimp_preview_invalidate (preview);
return TRUE;
}
break;
default: