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

app/tools/gimpcurvestool.c app/tools/gimpinkoptions.c removed explicit 

2004-01-29  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpcurvestool.c
	* app/tools/gimpinkoptions.c
	* app/tools/gimplevelstool.c: removed explicit grabs. The pointer
	is already implicitely grabbed while the button is pressed.
This commit is contained in:
Sven Neumann 2004-01-29 13:59:14 +00:00 committed by Sven Neumann
parent a479831ba4
commit 4591bc1a8d
6 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-01-29 Sven Neumann <sven@gimp.org>
* app/tools/gimpcurvestool.c
* app/tools/gimpinkoptions.c
* app/tools/gimplevelstool.c: removed explicit grabs. The pointer
is already implicitely grabbed while the button is pressed.
2004-01-29 Michael Natterer <mitch@gimp.org>
* configure.in: reset binary age because of struct changes below.

20
app/paint/gimpinkoptions.c
View File

@ -100,7 +100,7 @@ gimp_ink_options_get_type (void)
return type;
}
static void
static void
gimp_ink_options_class_init (GimpInkOptionsClass *klass)
{
GObjectClass *object_class;
@ -378,7 +378,7 @@ typedef struct _BrushWidget BrushWidget;
struct _BrushWidget
{
GtkWidget *widget;
gboolean state;
gboolean active;
/* EEK */
GimpInkOptions *ink_options;
@ -415,7 +415,7 @@ brush_widget_new (GimpInkOptions *options)
brush_w = g_new (BrushWidget, 1);
brush_w->widget = gtk_drawing_area_new ();
brush_w->state = FALSE;
brush_w->active = FALSE;
brush_w->ink_options = options;
gtk_widget_set_size_request (brush_w->widget, 60, 60);
@ -439,7 +439,7 @@ brush_widget_new (GimpInkOptions *options)
G_CALLBACK (brush_widget_motion_notify),
brush_w);
g_signal_connect (brush_w->widget, "expose_event",
G_CALLBACK (brush_widget_expose),
G_CALLBACK (brush_widget_expose),
brush_w);
g_signal_connect (brush_w->widget, "realize",
G_CALLBACK (brush_widget_realize),
@ -556,7 +556,7 @@ brush_widget_expose (GtkWidget *widget,
brush_widget_active_rect (brush_widget, widget, &rect);
gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_NORMAL],
TRUE, /* filled */
rect.x, rect.y,
rect.x, rect.y,
rect.width, rect.height);
gtk_paint_shadow (widget->style, widget->window, widget->state,
GTK_SHADOW_OUT,
@ -579,9 +579,7 @@ brush_widget_button_press (GtkWidget *widget,
if ((event->x >= rect.x) && (event->x-rect.x < rect.width) &&
(event->y >= rect.y) && (event->y-rect.y < rect.height))
{
brush_widget->state = TRUE;
gtk_grab_add (brush_widget->widget);
brush_widget->active = TRUE;
}
return TRUE;
@ -592,9 +590,7 @@ brush_widget_button_release (GtkWidget *widget,
GdkEventButton *event,
BrushWidget *brush_widget)
{
brush_widget->state = FALSE;
gtk_grab_remove (brush_widget->widget);
brush_widget->active = FALSE;
return TRUE;
}
@ -604,7 +600,7 @@ brush_widget_motion_notify (GtkWidget *widget,
GdkEventMotion *event,
BrushWidget *brush_widget)
{
if (brush_widget->state)
if (brush_widget->active)
{
gint x;
gint y;

4
app/tools/gimpcurvestool.c
View File

@ -955,12 +955,11 @@ curves_graph_events (GtkWidget *widget,
break;
}
gtk_grab_add (widget);
curves_calculate_curve (c_tool->curves, c_tool->channel);
curves_update (c_tool, XRANGE_TOP);
gtk_widget_queue_draw (c_tool->graph);
return TRUE;
case GDK_BUTTON_RELEASE:
@ -969,7 +968,6 @@ curves_graph_events (GtkWidget *widget,
gimp_image_map_tool_preview (GIMP_IMAGE_MAP_TOOL (c_tool));
gtk_grab_remove (widget);
return TRUE;
case GDK_MOTION_NOTIFY:

20
app/tools/gimpinkoptions-gui.c
View File

@ -100,7 +100,7 @@ gimp_ink_options_get_type (void)
return type;
}
static void
static void
gimp_ink_options_class_init (GimpInkOptionsClass *klass)
{
GObjectClass *object_class;
@ -378,7 +378,7 @@ typedef struct _BrushWidget BrushWidget;
struct _BrushWidget
{
GtkWidget *widget;
gboolean state;
gboolean active;
/* EEK */
GimpInkOptions *ink_options;
@ -415,7 +415,7 @@ brush_widget_new (GimpInkOptions *options)
brush_w = g_new (BrushWidget, 1);
brush_w->widget = gtk_drawing_area_new ();
brush_w->state = FALSE;
brush_w->active = FALSE;
brush_w->ink_options = options;
gtk_widget_set_size_request (brush_w->widget, 60, 60);
@ -439,7 +439,7 @@ brush_widget_new (GimpInkOptions *options)
G_CALLBACK (brush_widget_motion_notify),
brush_w);
g_signal_connect (brush_w->widget, "expose_event",
G_CALLBACK (brush_widget_expose),
G_CALLBACK (brush_widget_expose),
brush_w);
g_signal_connect (brush_w->widget, "realize",
G_CALLBACK (brush_widget_realize),
@ -556,7 +556,7 @@ brush_widget_expose (GtkWidget *widget,
brush_widget_active_rect (brush_widget, widget, &rect);
gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_NORMAL],
TRUE, /* filled */
rect.x, rect.y,
rect.x, rect.y,
rect.width, rect.height);
gtk_paint_shadow (widget->style, widget->window, widget->state,
GTK_SHADOW_OUT,
@ -579,9 +579,7 @@ brush_widget_button_press (GtkWidget *widget,
if ((event->x >= rect.x) && (event->x-rect.x < rect.width) &&
(event->y >= rect.y) && (event->y-rect.y < rect.height))
{
brush_widget->state = TRUE;
gtk_grab_add (brush_widget->widget);
brush_widget->active = TRUE;
}
return TRUE;
@ -592,9 +590,7 @@ brush_widget_button_release (GtkWidget *widget,
GdkEventButton *event,
BrushWidget *brush_widget)
{
brush_widget->state = FALSE;
gtk_grab_remove (brush_widget->widget);
brush_widget->active = FALSE;
return TRUE;
}
@ -604,7 +600,7 @@ brush_widget_motion_notify (GtkWidget *widget,
GdkEventMotion *event,
BrushWidget *brush_widget)
{
if (brush_widget->state)
if (brush_widget->active)
{
gint x;
gint y;

20
app/tools/gimpinkoptions.c
View File

@ -100,7 +100,7 @@ gimp_ink_options_get_type (void)
return type;
}
static void
static void
gimp_ink_options_class_init (GimpInkOptionsClass *klass)
{
GObjectClass *object_class;
@ -378,7 +378,7 @@ typedef struct _BrushWidget BrushWidget;
struct _BrushWidget
{
GtkWidget *widget;
gboolean state;
gboolean active;
/* EEK */
GimpInkOptions *ink_options;
@ -415,7 +415,7 @@ brush_widget_new (GimpInkOptions *options)
brush_w = g_new (BrushWidget, 1);
brush_w->widget = gtk_drawing_area_new ();
brush_w->state = FALSE;
brush_w->active = FALSE;
brush_w->ink_options = options;
gtk_widget_set_size_request (brush_w->widget, 60, 60);
@ -439,7 +439,7 @@ brush_widget_new (GimpInkOptions *options)
G_CALLBACK (brush_widget_motion_notify),
brush_w);
g_signal_connect (brush_w->widget, "expose_event",
G_CALLBACK (brush_widget_expose),
G_CALLBACK (brush_widget_expose),
brush_w);
g_signal_connect (brush_w->widget, "realize",
G_CALLBACK (brush_widget_realize),
@ -556,7 +556,7 @@ brush_widget_expose (GtkWidget *widget,
brush_widget_active_rect (brush_widget, widget, &rect);
gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_NORMAL],
TRUE, /* filled */
rect.x, rect.y,
rect.x, rect.y,
rect.width, rect.height);
gtk_paint_shadow (widget->style, widget->window, widget->state,
GTK_SHADOW_OUT,
@ -579,9 +579,7 @@ brush_widget_button_press (GtkWidget *widget,
if ((event->x >= rect.x) && (event->x-rect.x < rect.width) &&
(event->y >= rect.y) && (event->y-rect.y < rect.height))
{
brush_widget->state = TRUE;
gtk_grab_add (brush_widget->widget);
brush_widget->active = TRUE;
}
return TRUE;
@ -592,9 +590,7 @@ brush_widget_button_release (GtkWidget *widget,
GdkEventButton *event,
BrushWidget *brush_widget)
{
brush_widget->state = FALSE;
gtk_grab_remove (brush_widget->widget);
brush_widget->active = FALSE;
return TRUE;
}
@ -604,7 +600,7 @@ brush_widget_motion_notify (GtkWidget *widget,
GdkEventMotion *event,
BrushWidget *brush_widget)
{
if (brush_widget->state)
if (brush_widget->active)
{
gint x;
gint y;

4
app/tools/gimplevelstool.c
View File

@ -748,7 +748,7 @@ levels_draw_slider (GdkWindow *window,
GdkGC *fill_gc,
gint xpos)
{
int y;
gint y;
for (y = 0; y < CONTROL_HEIGHT; y++)
gdk_draw_line (window, fill_gc,
@ -1120,7 +1120,6 @@ levels_input_area_event (GtkWidget *widget,
switch (event->type)
{
case GDK_BUTTON_PRESS:
gtk_grab_add (widget);
bevent = (GdkEventButton *) event;
distance = G_MAXINT;
@ -1136,7 +1135,6 @@ levels_input_area_event (GtkWidget *widget,
break;
case GDK_BUTTON_RELEASE:
gtk_grab_remove (widget);
switch (l_tool->active_slider)
{
case 0: /* low input */