Commit 405af739 authored by EDT 1998 Matthew Wilson's avatar EDT 1998 Matthew Wilson Committed by Matt Wilson

removed the tool reset when changing gdisplays stop draw_core when

Tue Apr 21 15:11:21 EDT 1998 Matthew Wilson <msw@gimp.org>

	* app/disp_callbacks.c: removed the tool reset when changing gdisplays
	* app/bezier_select.c: stop draw_core when changing gdisplays
--Matt
parent aaaeed09
Tus Apr 21 01:59:12 EDT 1998 Matthew Wilson <msw@gimp.org>
Tue Apr 21 15:11:21 EDT 1998 Matthew Wilson <msw@gimp.org>
* app/disp_callbacks.c: removed the tool reset when changing gdisplays
* app/bezier_select.c: stop draw_core when changing gdisplays
Tue Apr 21 01:59:12 EDT 1998 Matthew Wilson <msw@gimp.org>
* app/iscissors.c: Remove the iscissors outline by stopping the
draw_core before bezierifying the selection. There may be
......
......@@ -248,7 +248,7 @@ bezier_select_button_press (Tool *tool,
/* If the tool was being used in another image...reset it */
if (tool->state == ACTIVE && gdisp_ptr != tool->gdisp_ptr) {
printf("Reset!\n");
draw_core_stop(bezier_sel->core, tool);
bezier_select_reset (bezier_sel);
}
gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, &x, &y, TRUE, 0);
......
......@@ -166,20 +166,24 @@ gdisplay_canvas_events (GtkWidget *canvas,
}
/* reset the current tool if we're changing gdisplays */
/*
if (active_tool->gdisp_ptr) {
tool_gdisp = active_tool->gdisp_ptr;
if (tool_gdisp->ID != gdisp->ID)
if (tool_gdisp->ID != gdisp->ID) {
tools_initialize (active_tool->type, gdisp);
/* Reset the current tool if we're changing drawables... */
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
}
} else
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
!active_tool->preserve)
tools_initialize (active_tool->type, gdisp);
} else
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
} else
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
(* active_tool->button_press_func) (active_tool, bevent, gdisp);
}
break;
......
......@@ -166,20 +166,24 @@ gdisplay_canvas_events (GtkWidget *canvas,
}
/* reset the current tool if we're changing gdisplays */
/*
if (active_tool->gdisp_ptr) {
tool_gdisp = active_tool->gdisp_ptr;
if (tool_gdisp->ID != gdisp->ID)
if (tool_gdisp->ID != gdisp->ID) {
tools_initialize (active_tool->type, gdisp);
/* Reset the current tool if we're changing drawables... */
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
}
} else
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
!active_tool->preserve)
tools_initialize (active_tool->type, gdisp);
} else
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
} else
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
(* active_tool->button_press_func) (active_tool, bevent, gdisp);
}
break;
......
......@@ -166,20 +166,24 @@ gdisplay_canvas_events (GtkWidget *canvas,
}
/* reset the current tool if we're changing gdisplays */
/*
if (active_tool->gdisp_ptr) {
tool_gdisp = active_tool->gdisp_ptr;
if (tool_gdisp->ID != gdisp->ID)
if (tool_gdisp->ID != gdisp->ID) {
tools_initialize (active_tool->type, gdisp);
/* Reset the current tool if we're changing drawables... */
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
}
} else
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
!active_tool->preserve)
tools_initialize (active_tool->type, gdisp);
} else
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
} else
active_tool->drawable = gimage_active_drawable(gdisp->gimage);
(* active_tool->button_press_func) (active_tool, bevent, gdisp);
}
break;
......
......@@ -248,7 +248,7 @@ bezier_select_button_press (Tool *tool,
/* If the tool was being used in another image...reset it */
if (tool->state == ACTIVE && gdisp_ptr != tool->gdisp_ptr) {
printf("Reset!\n");
draw_core_stop(bezier_sel->core, tool);
bezier_select_reset (bezier_sel);
}
gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, &x, &y, TRUE, 0);
......
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