Commit 4d03c886 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/tools/gimpmagnifytool.c (gimp_magnify_tool_init)

2005-02-22  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpmagnifytool.c (gimp_magnify_tool_init)
	* app/tools/gimpmeasuretool.c (gimp_measure_tool_init)
	* app/tools/gimpvectortool.c (gimp_vector_tool_init): set
	handles_empty_image to TRUE because all these tools work fine
	without active drawable.

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): also look at
	handles_empty_image, not only at gimp_image_is_empty() before
	setting the BAD cursor.
parent 87e1f2de
2005-02-22 Michael Natterer <mitch@gimp.org>
* app/tools/gimpmagnifytool.c (gimp_magnify_tool_init)
* app/tools/gimpmeasuretool.c (gimp_measure_tool_init)
* app/tools/gimpvectortool.c (gimp_vector_tool_init): set
handles_empty_image to TRUE because all these tools work fine
without active drawable.
* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_canvas_tool_events): also look at
handles_empty_image, not only at gimp_image_is_empty() before
setting the BAD cursor.
2005-02-21 Manish Singh <yosh@gimp.org> 2005-02-21 Manish Singh <yosh@gimp.org>
* app/text/gimpfont-utils.[ch]: be smarter about finding trailing * app/text/gimpfont-utils.[ch]: be smarter about finding trailing
......
...@@ -634,7 +634,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, ...@@ -634,7 +634,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
&image_coords, state, &image_coords, state,
gdisp); gdisp);
} }
else if (gimp_image_is_empty (gimage)) else if (gimp_image_is_empty (gimage) &&
! gimp_tool_control_handles_empty_image (active_tool->control))
{ {
gimp_display_shell_set_cursor (shell, gimp_display_shell_set_cursor (shell,
GIMP_CURSOR_BAD, GIMP_CURSOR_BAD,
...@@ -1319,7 +1320,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, ...@@ -1319,7 +1320,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
&image_coords, state, &image_coords, state,
gdisp); gdisp);
} }
else if (gimp_image_is_empty (gimage)) else if (gimp_image_is_empty (gimage) &&
! gimp_tool_control_handles_empty_image (active_tool->control))
{ {
gimp_display_shell_set_cursor (shell, gimp_display_shell_set_cursor (shell,
GIMP_CURSOR_BAD, GIMP_CURSOR_BAD,
......
...@@ -159,6 +159,7 @@ gimp_magnify_tool_init (GimpMagnifyTool *magnify_tool) ...@@ -159,6 +159,7 @@ gimp_magnify_tool_init (GimpMagnifyTool *magnify_tool)
magnify_tool->h = 0; magnify_tool->h = 0;
gimp_tool_control_set_scroll_lock (tool->control, TRUE); gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_handles_empty_image (tool->control, TRUE);
gimp_tool_control_set_snap_to (tool->control, FALSE); gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_cursor (tool->control, gimp_tool_control_set_cursor (tool->control,
......
...@@ -174,7 +174,9 @@ gimp_measure_tool_init (GimpMeasureTool *measure_tool) ...@@ -174,7 +174,9 @@ gimp_measure_tool_init (GimpMeasureTool *measure_tool)
{ {
GimpTool *tool = GIMP_TOOL (measure_tool); GimpTool *tool = GIMP_TOOL (measure_tool);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_MEASURE); gimp_tool_control_set_handles_empty_image (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_MEASURE);
} }
static void static void
......
...@@ -223,9 +223,12 @@ gimp_vector_tool_init (GimpVectorTool *vector_tool) ...@@ -223,9 +223,12 @@ gimp_vector_tool_init (GimpVectorTool *vector_tool)
{ {
GimpTool *tool = GIMP_TOOL (vector_tool); GimpTool *tool = GIMP_TOOL (vector_tool);
gimp_tool_control_set_scroll_lock (tool->control, TRUE); gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_COMPRESS); gimp_tool_control_set_handles_empty_image (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_PATHS); gimp_tool_control_set_motion_mode (tool->control,
GIMP_MOTION_MODE_COMPRESS);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_PATHS);
vector_tool->status_msg = NULL; vector_tool->status_msg = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment