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

app/tools/gimptool.[ch] add "gboolean proximity" parameter to 

2006-03-25  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimptool.[ch]
	* app/tools/tool_manager.[ch]: add "gboolean proximity" parameter
	to GimpTool::oper_update() in order to emphasize its importance
	and to avoid peeking around in the GimpDisplayShell struct.

	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpcolortool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimpforegroundselecttool.c
	* app/tools/gimpiscissorstool.c
	* app/tools/gimpmovetool.c
	* app/tools/gimpnewrectselecttool.c
	* app/tools/gimppainttool.c
	* app/tools/gimprectangletool.[ch]
	* app/tools/gimpselectiontool.c
	* app/tools/gimptransformtool.c
	* app/tools/gimpvectortool.c: changed accordingly. Got rid of
	quite some "display/gimpdisplayshell.h" includes.

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): pass shell->proximity to
	tool_manager_oper_update_active().
This commit is contained in:
Michael Natterer 2006-03-25 14:23:09 +00:00 committed by Michael Natterer
parent 0e7a40face
commit 2ed407b54f
24 changed files with 126 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
2006-03-25 Michael Natterer <mitch@gimp.org>
* app/tools/gimptool.[ch]
* app/tools/tool_manager.[ch]: add "gboolean proximity" parameter
to GimpTool::oper_update() in order to emphasize its importance
and to avoid peeking around in the GimpDisplayShell struct.
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpclonetool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpcolortool.c
* app/tools/gimpcurvestool.c
* app/tools/gimpforegroundselecttool.c
* app/tools/gimpiscissorstool.c
* app/tools/gimpmovetool.c
* app/tools/gimpnewrectselecttool.c
* app/tools/gimppainttool.c
* app/tools/gimprectangletool.[ch]
* app/tools/gimpselectiontool.c
* app/tools/gimptransformtool.c
* app/tools/gimpvectortool.c: changed accordingly. Got rid of
quite some "display/gimpdisplayshell.h" includes.
* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_canvas_tool_events): pass shell->proximity to
tool_manager_oper_update_active().
2006-03-25 Michael Natterer <mitch@gimp.org>
* app/tools/gimpclonetool.c

13
app/display/gimpdisplayshell-callbacks.c
View File

@ -528,6 +528,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
}
break;
@ -544,6 +545,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
}
break;
@ -551,6 +553,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
case GDK_PROXIMITY_IN:
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
break;
@ -560,6 +563,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
break;
@ -583,6 +587,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
}
}
@ -600,6 +605,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, 0,
shell->proximity,
gdisp);
}
@ -625,6 +631,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
active_tool = tool_manager_get_active (gimp);
@ -806,6 +813,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
gtk_grab_remove (canvas);
@ -825,6 +833,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
shell->space_release_pending = FALSE;
@ -950,6 +959,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
return_val = TRUE;
@ -1116,6 +1126,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
}
}
@ -1237,6 +1248,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
}
break;
@ -1294,6 +1306,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
gdisp);
}
break;

11
app/tools/gimpbrushtool.c
View File

@ -47,7 +47,6 @@
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpstatusbar.h"
#include "gimpcoloroptions.h"
#include "gimpcolorpickertool.h"
@ -93,6 +92,7 @@ static void gimp_paint_tool_modifier_key (GimpTool *tool,
static void gimp_paint_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_paint_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -580,6 +580,7 @@ static void
gimp_paint_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
@ -593,7 +594,8 @@ gimp_paint_tool_oper_update (GimpTool *tool,
if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (draw_tool)))
{
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
proximity, gdisp);
return;
}
@ -621,7 +623,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
drawable = gimp_image_active_drawable (gdisp->gimage);
if (drawable && shell->proximity)
if (drawable && proximity)
{
if (gdisp == tool->gdisp && (state & GDK_SHIFT_MASK))
{
@ -702,7 +704,8 @@ gimp_paint_tool_oper_update (GimpTool *tool,
gimp_draw_tool_start (draw_tool, gdisp);
}
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
}
static void

2
app/tools/gimpbycolorselecttool.c
View File

@ -55,6 +55,7 @@ static void gimp_by_color_select_tool_button_release (GimpTool *tool,
static void gimp_by_color_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_by_color_select_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -202,6 +203,7 @@ static void
gimp_by_color_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpSelectionTool *sel_tool = GIMP_SELECTION_TOOL (tool);

8
app/tools/gimpclonetool.c
View File

@ -37,7 +37,6 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "gimpclonetool.h"
#include "gimppaintoptions-gui.h"
@ -68,6 +67,7 @@ static void gimp_clone_tool_cursor_update (GimpTool *tool,
static void gimp_clone_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_clone_tool_draw (GimpDrawTool *draw_tool);
@ -227,15 +227,17 @@ static void
gimp_clone_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpToolOptions *options = tool->tool_info->tool_options;
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
if (GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_IMAGE_CLONE &&
GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable == NULL &&
GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
proximity)
{
gimp_tool_replace_status (tool, gdisp,
_("Ctrl-Click to set a clone source."));

5
app/tools/gimpcolorpickertool.c
View File

@ -68,6 +68,7 @@ static void gimp_color_picker_tool_modifier_key (GimpTool *tool,
static void gimp_color_picker_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_color_picker_tool_picked (GimpColorTool *color_tool,
@ -227,6 +228,7 @@ static void
gimp_color_picker_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpColorPickerOptions *options;
@ -235,7 +237,8 @@ gimp_color_picker_tool_oper_update (GimpTool *tool,
GIMP_COLOR_TOOL (tool)->pick_mode = options->pick_mode;
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
}
static void

4
app/tools/gimpcolortool.c
View File

@ -79,6 +79,7 @@ static void gimp_color_tool_motion (GimpTool *tool,
static void gimp_color_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_color_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -442,6 +443,7 @@ static void
gimp_color_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool);
@ -449,7 +451,7 @@ gimp_color_tool_oper_update (GimpTool *tool,
GimpSamplePoint *sample_point = NULL;
if (color_tool->enabled &&
gimp_display_shell_get_show_sample_points (shell) && shell->proximity)
gimp_display_shell_get_show_sample_points (shell) && proximity)
{
gint snap_distance;

8
app/tools/gimpcurvestool.c
View File

@ -49,7 +49,6 @@
#include "widgets/gimphistogramview.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "gimpcurvestool.h"
#include "gimphistogramoptions.h"
@ -86,6 +85,7 @@ static gboolean gimp_curves_tool_key_press (GimpTool *tool,
static void gimp_curves_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_curves_tool_color_picked (GimpColorTool *color_tool,
@ -340,12 +340,14 @@ static void
gimp_curves_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpColorPickMode mode = GIMP_COLOR_PICK_MODE_NONE;
const gchar *status = NULL;
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
gimp_tool_pop_status (tool, gdisp);
@ -362,7 +364,7 @@ gimp_curves_tool_oper_update (GimpTool *tool,
GIMP_COLOR_TOOL (tool)->pick_mode = mode;
if (status && GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
if (status && proximity)
gimp_tool_push_status (tool, gdisp, status);
}

7
app/tools/gimpforegroundselecttool.c
View File

@ -73,6 +73,7 @@ static void gimp_foreground_select_tool_control (GimpTool *tool,
static void gimp_foreground_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_foreground_select_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -270,6 +271,7 @@ static void
gimp_foreground_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (tool);
@ -281,7 +283,8 @@ gimp_foreground_select_tool_oper_update (GimpTool *tool,
GIMP_FREE_SELECT_TOOL (tool)->last_coords = *coords;
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
if (fg_select->mask)
{
@ -316,7 +319,7 @@ gimp_foreground_select_tool_oper_update (GimpTool *tool,
}
}
if (GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
if (proximity)
{
if (status)
gimp_tool_replace_status (tool, gdisp, status);

5
app/tools/gimpiscissorstool.c
View File

@ -145,6 +145,7 @@ static void gimp_iscissors_tool_motion (GimpTool *tool,
static void gimp_iscissors_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_iscissors_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -931,11 +932,13 @@ static void
gimp_iscissors_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpIscissorsTool *iscissors = GIMP_ISCISSORS_TOOL (tool);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
if (mouse_over_vertex (iscissors, coords->x, coords->y))
{

4
app/tools/gimpmovetool.c
View File

@ -85,6 +85,7 @@ static void gimp_move_tool_modifier_key (GimpTool *tool,
static void gimp_move_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_move_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -609,6 +610,7 @@ static void
gimp_move_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpMoveTool *move = GIMP_MOVE_TOOL (tool);
@ -619,7 +621,7 @@ gimp_move_tool_oper_update (GimpTool *tool,
if (options->move_type == GIMP_TRANSFORM_TYPE_LAYER &&
! options->move_current &&
gimp_display_shell_get_show_guides (shell) &&
shell->proximity)
proximity)
{
gint snap_distance;

7
app/tools/gimpnewrectselecttool.c
View File

@ -78,6 +78,7 @@ static void gimp_new_rect_select_tool_button_release (GimpTool *tool,
static void gimp_new_rect_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static gboolean gimp_new_rect_select_tool_execute (GimpRectangleTool *rect_tool,
gint x,
@ -233,11 +234,13 @@ static void
gimp_new_rect_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
gimp_rectangle_tool_oper_update (tool, coords, state, gdisp);
gimp_rectangle_tool_oper_update (tool, coords, state, proximity, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
}
/*

11
app/tools/gimppainttool.c
View File

@ -47,7 +47,6 @@
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpstatusbar.h"
#include "gimpcoloroptions.h"
#include "gimpcolorpickertool.h"
@ -93,6 +92,7 @@ static void gimp_paint_tool_modifier_key (GimpTool *tool,
static void gimp_paint_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_paint_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -580,6 +580,7 @@ static void
gimp_paint_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
@ -593,7 +594,8 @@ gimp_paint_tool_oper_update (GimpTool *tool,
if (gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (draw_tool)))
{
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state,
proximity, gdisp);
return;
}
@ -621,7 +623,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
drawable = gimp_image_active_drawable (gdisp->gimage);
if (drawable && shell->proximity)
if (drawable && proximity)
{
if (gdisp == tool->gdisp && (state & GDK_SHIFT_MASK))
{
@ -702,7 +704,8 @@ gimp_paint_tool_oper_update (GimpTool *tool,
gimp_draw_tool_start (draw_tool, gdisp);
}
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
}
static void

7
app/tools/gimprectangleselecttool.c
View File

@ -78,6 +78,7 @@ static void gimp_new_rect_select_tool_button_release (GimpTool *tool,
static void gimp_new_rect_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static gboolean gimp_new_rect_select_tool_execute (GimpRectangleTool *rect_tool,
gint x,
@ -233,11 +234,13 @@ static void
gimp_new_rect_select_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
gimp_rectangle_tool_oper_update (tool, coords, state, gdisp);
gimp_rectangle_tool_oper_update (tool, coords, state, proximity, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
}
/*

1
app/tools/gimprectangletool.c
View File

@ -1357,6 +1357,7 @@ void
gimp_rectangle_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpRectangleTool *rectangle = GIMP_RECTANGLE_TOOL (tool);

1
app/tools/gimprectangletool.h
View File

@ -122,6 +122,7 @@ void gimp_rectangle_tool_modifier_key (GimpTool *tool,
void gimp_rectangle_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
void gimp_rectangle_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,

5
app/tools/gimpselectiontool.c
View File

@ -32,7 +32,6 @@
#include "core/gimptoolinfo.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "gimpeditselectiontool.h"
#include "gimpselectiontool.h"
@ -53,6 +52,7 @@ static void gimp_selection_tool_modifier_key (GimpTool *tool,
static void gimp_selection_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_selection_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -154,6 +154,7 @@ static void
gimp_selection_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpSelectionTool *selection_tool = GIMP_SELECTION_TOOL (tool);
@ -221,7 +222,7 @@ gimp_selection_tool_oper_update (GimpTool *tool,
gimp_tool_pop_status (tool, gdisp);
if (GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
if (proximity)
{
const gchar *status = NULL;

8
app/tools/gimpsourcetool.c
View File

@ -37,7 +37,6 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "gimpclonetool.h"
#include "gimppaintoptions-gui.h"
@ -68,6 +67,7 @@ static void gimp_clone_tool_cursor_update (GimpTool *tool,
static void gimp_clone_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_clone_tool_draw (GimpDrawTool *draw_tool);
@ -227,15 +227,17 @@ static void
gimp_clone_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpToolOptions *options = tool->tool_info->tool_options;
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
gdisp);
if (GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_IMAGE_CLONE &&
GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable == NULL &&
GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
proximity)
{
gimp_tool_replace_status (tool, gdisp,
_("Ctrl-Click to set a clone source."));

6
app/tools/gimptool.c
View File

@ -82,6 +82,7 @@ static void gimp_tool_real_modifier_key (GimpTool *tool,
static void gimp_tool_real_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_tool_real_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -266,6 +267,7 @@ static void
gimp_tool_real_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
}
@ -471,13 +473,15 @@ void
gimp_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
g_return_if_fail (GIMP_IS_TOOL (tool));
g_return_if_fail (coords != NULL);
g_return_if_fail (GIMP_IS_DISPLAY (gdisp));
GIMP_TOOL_GET_CLASS (tool)->oper_update (tool, coords, state, gdisp);
GIMP_TOOL_GET_CLASS (tool)->oper_update (tool, coords, state, proximity,
gdisp);
}
void

2
app/tools/gimptool.h
View File

@ -94,6 +94,7 @@ struct _GimpToolClass
void (* oper_update) (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
void (* cursor_update) (GimpTool *tool,
GimpCoords *coords,
@ -139,6 +140,7 @@ void gimp_tool_set_modifier_state (GimpTool *tool,
void gimp_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
void gimp_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,

4
app/tools/gimptransformtool.c
View File

@ -111,6 +111,7 @@ static void gimp_transform_tool_modifier_key (GimpTool *tool,
static void gimp_transform_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_transform_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
@ -395,7 +396,7 @@ gimp_transform_tool_button_press (GimpTool *tool,
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);
if (tr_tool->function == TRANSFORM_CREATING && tr_tool->use_grid)
gimp_transform_tool_oper_update (tool, coords, state, gdisp);
gimp_transform_tool_oper_update (tool, coords, state, TRUE, gdisp);
tr_tool->lastx = tr_tool->startx = coords->x;
tr_tool->lasty = tr_tool->starty = coords->y;
@ -549,6 +550,7 @@ static void
gimp_transform_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (tool);

12
app/tools/gimpvectortool.c
View File

@ -97,9 +97,11 @@ static void gimp_vector_tool_modifier_key (GimpTool *tool,
static void gimp_vector_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
static void gimp_vector_tool_status_update (GimpTool *tool,
GimpDisplay *gdisp);
GimpDisplay *gdisp,
gboolean proximity);
static void gimp_vector_tool_cursor_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
@ -895,6 +897,7 @@ static void
gimp_vector_tool_oper_update (GimpTool *tool,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool);
@ -1130,19 +1133,20 @@ gimp_vector_tool_oper_update (GimpTool *tool,
break;
}
gimp_vector_tool_status_update (tool, gdisp);
gimp_vector_tool_status_update (tool, gdisp, proximity);
}
static void
gimp_vector_tool_status_update (GimpTool *tool,
GimpDisplay *gdisp)
GimpDisplay *gdisp,
gboolean proximity)
{
GimpVectorTool *vector_tool = GIMP_VECTOR_TOOL (tool);
gimp_tool_pop_status (tool, gdisp);
if (GIMP_DISPLAY_SHELL (gdisp->shell)->proximity)
if (proximity)
{
const gchar *status = NULL;

3
app/tools/tool_manager.c
View File

@ -386,6 +386,7 @@ void
tool_manager_oper_update_active (Gimp *gimp,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp)
{
GimpToolManager *tool_manager;
@ -397,7 +398,7 @@ tool_manager_oper_update_active (Gimp *gimp,
if (tool_manager->active_tool)
{
gimp_tool_oper_update (tool_manager->active_tool,
coords, state,
coords, state, proximity,
gdisp);
}
}

1
app/tools/tool_manager.h
View File

@ -66,6 +66,7 @@ void tool_manager_modifier_state_active (Gimp *gimp,
void tool_manager_oper_update_active (Gimp *gimp,
GimpCoords *coords,
GdkModifierType state,
gboolean proximity,
GimpDisplay *gdisp);
void tool_manager_cursor_update_active (Gimp *gimp,
GimpCoords *coords,