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

request click events, removed target_x,y struct members and button_press() 

2007-03-08  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpbucketfilltool.[ch]: request click events, removed
	target_x,y struct members and button_press() implementation and
	use the coords passed in button_release(). Also make sure that
	a click has no effect in areas where we show the bad corsor.


svn path=/trunk/; revision=22075
This commit is contained in:
Michael Natterer 2007-03-08 15:32:58 +00:00 committed by Michael Natterer
parent 4af6da98e1
commit 8fcb05e6e7
3 changed files with 34 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-03-08 Michael Natterer <mitch@gimp.org>
* app/tools/gimpbucketfilltool.[ch]: request click events, removed
target_x,y struct members and button_press() implementation and
use the coords passed in button_release(). Also make sure that
a click has no effect in areas where we show the bad corsor.
2007-03-08 Sven Neumann <sven@gimp.org>
* plug-ins/pygimp/gimpfu.py: support mnemonics in parameter labels.

74
app/tools/gimpbucketfilltool.c
View File

@ -19,18 +19,14 @@
#include "config.h"
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "tools-types.h"
#include "config/gimpguiconfig.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
#include "core/gimpdrawable-bucket-fill.h"
#include "core/gimpimage.h"
#include "core/gimpitem.h"
#include "core/gimppickable.h"
#include "widgets/gimphelp-ids.h"
@ -46,11 +42,6 @@
/* local function prototypes */
static void gimp_bucket_fill_tool_button_press (GimpTool *tool,
GimpCoords *coords,
guint32 time,
GdkModifierType state,
GimpDisplay *display);
static void gimp_bucket_fill_tool_button_release (GimpTool *tool,
GimpCoords *coords,
guint32 time,
@ -99,7 +90,6 @@ gimp_bucket_fill_tool_class_init (GimpBucketFillToolClass *klass)
{
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
tool_class->button_press = gimp_bucket_fill_tool_button_press;
tool_class->button_release = gimp_bucket_fill_tool_button_release;
tool_class->modifier_key = gimp_bucket_fill_tool_modifier_key;
tool_class->cursor_update = gimp_bucket_fill_tool_cursor_update;
@ -111,6 +101,7 @@ gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
GimpTool *tool = GIMP_TOOL (bucket_fill_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_wants_click (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_BUCKET_FILL);
gimp_tool_control_set_action_value_1 (tool->control,
@ -119,34 +110,6 @@ gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
"context/context-pattern-select-set");
}
static void
gimp_bucket_fill_tool_button_press (GimpTool *tool,
GimpCoords *coords,
guint32 time,
GdkModifierType state,
GimpDisplay *display)
{
GimpBucketFillTool *bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
bucket_tool->target_x = coords->x;
bucket_tool->target_y = coords->y;
if (! options->sample_merged)
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (gimp_image_active_drawable (display->image)),
&off_x, &off_y);
bucket_tool->target_x -= off_x;
bucket_tool->target_y -= off_y;
}
tool->display = display;
gimp_tool_control_activate (tool->control);
}
static void
gimp_bucket_fill_tool_button_release (GimpTool *tool,
GimpCoords *coords,
@ -155,13 +118,30 @@ gimp_bucket_fill_tool_button_release (GimpTool *tool,
GimpButtonReleaseType release_type,
GimpDisplay *display)
{
GimpBucketFillTool *bucket_tool = GIMP_BUCKET_FILL_TOOL (tool);
GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
GimpContext *context = GIMP_CONTEXT (options);
GimpBucketFillOptions *options = GIMP_BUCKET_FILL_TOOL_GET_OPTIONS (tool);
if (release_type != GIMP_BUTTON_RELEASE_CANCEL)
if (release_type == GIMP_BUTTON_RELEASE_CLICK &&
gimp_image_coords_in_active_pickable (display->image, coords,
options->sample_merged, TRUE))
{
gimp_drawable_bucket_fill (gimp_image_active_drawable (display->image),
GimpDrawable *drawable = gimp_image_active_drawable (display->image);
GimpContext *context = GIMP_CONTEXT (options);
gint x, y;
x = coords->x;
y = coords->y;
if (! options->sample_merged)
{
gint off_x, off_y;
gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
x -= off_x;
y -= off_y;
}
gimp_drawable_bucket_fill (drawable,
context,
options->fill_mode,
gimp_context_get_paint_mode (context),
@ -171,13 +151,13 @@ gimp_bucket_fill_tool_button_release (GimpTool *tool,
options->fill_criterion,
options->threshold,
options->sample_merged,
bucket_tool->target_x,
bucket_tool->target_y);
x, y);
gimp_image_flush (display->image);
}
gimp_tool_control_halt (tool->control);
GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
release_type, display);
}
static void

3
app/tools/gimpbucketfilltool.h
View File

@ -39,9 +39,6 @@ typedef struct _GimpBucketFillToolClass GimpBucketFillToolClass;
struct _GimpBucketFillTool
{
GimpTool parent_instance;
gint target_x; /* starting x coord */
gint target_y; /* starting y coord */
};
struct _GimpBucketFillToolClass