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

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
This commit is contained in:
EDT 1998 Matthew Wilson 1998-04-21 20:07:53 +00:00 committed by Matt Wilson
parent aaaeed098b
commit 405af739a0
6 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,4 +1,9 @@
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 * app/iscissors.c: Remove the iscissors outline by stopping the
draw_core before bezierifying the selection. There may be draw_core before bezierifying the selection. There may be

2
app/bezier_select.c
View File

@ -248,7 +248,7 @@ bezier_select_button_press (Tool *tool,
/* If the tool was being used in another image...reset it */ /* If the tool was being used in another image...reset it */
if (tool->state == ACTIVE && gdisp_ptr != tool->gdisp_ptr) { if (tool->state == ACTIVE && gdisp_ptr != tool->gdisp_ptr) {
printf("Reset!\n"); draw_core_stop(bezier_sel->core, tool);
bezier_select_reset (bezier_sel); bezier_select_reset (bezier_sel);
} }
gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, &x, &y, TRUE, 0); gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, &x, &y, TRUE, 0);

14
app/disp_callbacks.c
View File

@ -166,20 +166,24 @@ gdisplay_canvas_events (GtkWidget *canvas,
} }
/* reset the current tool if we're changing gdisplays */ /* reset the current tool if we're changing gdisplays */
/*
if (active_tool->gdisp_ptr) { if (active_tool->gdisp_ptr) {
tool_gdisp = 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); tools_initialize (active_tool->type, gdisp);
/* Reset the current tool if we're changing drawables... */ active_tool->drawable = gimage_active_drawable(gdisp->gimage);
}
} else } else
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) { if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) != if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) && drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
!active_tool->preserve) !active_tool->preserve)
tools_initialize (active_tool->type, gdisp); tools_initialize (active_tool->type, gdisp);
} else } else
active_tool->drawable = gimage_active_drawable(gdisp->gimage); active_tool->drawable = gimage_active_drawable(gdisp->gimage);
(* active_tool->button_press_func) (active_tool, bevent, gdisp); (* active_tool->button_press_func) (active_tool, bevent, gdisp);
} }
break; break;

14
app/display/gimpdisplay-callbacks.c
View File

@ -166,20 +166,24 @@ gdisplay_canvas_events (GtkWidget *canvas,
} }
/* reset the current tool if we're changing gdisplays */ /* reset the current tool if we're changing gdisplays */
/*
if (active_tool->gdisp_ptr) { if (active_tool->gdisp_ptr) {
tool_gdisp = 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); tools_initialize (active_tool->type, gdisp);
/* Reset the current tool if we're changing drawables... */ active_tool->drawable = gimage_active_drawable(gdisp->gimage);
}
} else } else
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) { if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) != if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) && drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
!active_tool->preserve) !active_tool->preserve)
tools_initialize (active_tool->type, gdisp); tools_initialize (active_tool->type, gdisp);
} else } else
active_tool->drawable = gimage_active_drawable(gdisp->gimage); active_tool->drawable = gimage_active_drawable(gdisp->gimage);
(* active_tool->button_press_func) (active_tool, bevent, gdisp); (* active_tool->button_press_func) (active_tool, bevent, gdisp);
} }
break; break;

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

@ -166,20 +166,24 @@ gdisplay_canvas_events (GtkWidget *canvas,
} }
/* reset the current tool if we're changing gdisplays */ /* reset the current tool if we're changing gdisplays */
/*
if (active_tool->gdisp_ptr) { if (active_tool->gdisp_ptr) {
tool_gdisp = 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); tools_initialize (active_tool->type, gdisp);
/* Reset the current tool if we're changing drawables... */ active_tool->drawable = gimage_active_drawable(gdisp->gimage);
}
} else } else
*/
/* reset the current tool if we're changing drawables */
if (active_tool->drawable) { if (active_tool->drawable) {
if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) != if ((drawable_ID(gimage_active_drawable(gdisp->gimage)) !=
drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) && drawable_ID(GIMP_DRAWABLE(active_tool->drawable))) &&
!active_tool->preserve) !active_tool->preserve)
tools_initialize (active_tool->type, gdisp); tools_initialize (active_tool->type, gdisp);
} else } else
active_tool->drawable = gimage_active_drawable(gdisp->gimage); active_tool->drawable = gimage_active_drawable(gdisp->gimage);
(* active_tool->button_press_func) (active_tool, bevent, gdisp); (* active_tool->button_press_func) (active_tool, bevent, gdisp);
} }
break; break;

2
app/tools/bezier_select.c
View File

@ -248,7 +248,7 @@ bezier_select_button_press (Tool *tool,
/* If the tool was being used in another image...reset it */ /* If the tool was being used in another image...reset it */
if (tool->state == ACTIVE && gdisp_ptr != tool->gdisp_ptr) { if (tool->state == ACTIVE && gdisp_ptr != tool->gdisp_ptr) {
printf("Reset!\n"); draw_core_stop(bezier_sel->core, tool);
bezier_select_reset (bezier_sel); bezier_select_reset (bezier_sel);
} }
gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, &x, &y, TRUE, 0); gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, &x, &y, TRUE, 0);