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

restart current tool when changing gdisplays 

Wed Apr 15 13:18:47 EDT 1998 Matthew Wilson <msw@gimp.org>

	* app/disp_callbacks.c: restart current tool when changing
	gdisplays

--Matt
This commit is contained in:
EDT 1998 Matthew Wilson 1998-04-15 17:21:18 +00:00 committed by Matt Wilson
parent 41d17fb403
commit 13dd65aef0
4 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Apr 15 13:18:47 EDT 1998 Matthew Wilson <msw@gimp.org>
* app/disp_callbacks.c: restart current tool when changing
gdisplays
Wed Apr 15 17:40:55 MEST 1998 Sven Neumann <sven@gimp.org>
* app/iscissors.c: changed toggle_buttons to check_buttons since

19
app/disp_callbacks.c
View File

@ -66,7 +66,7 @@ gint
gdisplay_canvas_events (GtkWidget *canvas,
GdkEvent *event)
{
GDisplay *gdisp;
GDisplay *gdisp, *tool_gdisp;
GdkEventExpose *eevent;
GdkEventMotion *mevent;
GdkEventButton *bevent;
@ -153,14 +153,19 @@ gdisplay_canvas_events (GtkWidget *canvas,
bevent->x = tx;
bevent->y = ty;
}
/* 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) {
/* 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)
tools_initialize (active_tool->type, gdisp);
}
/* Reset the current tool if we're changing drawables... */
} else
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);

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

@ -66,7 +66,7 @@ gint
gdisplay_canvas_events (GtkWidget *canvas,
GdkEvent *event)
{
GDisplay *gdisp;
GDisplay *gdisp, *tool_gdisp;
GdkEventExpose *eevent;
GdkEventMotion *mevent;
GdkEventButton *bevent;
@ -153,14 +153,19 @@ gdisplay_canvas_events (GtkWidget *canvas,
bevent->x = tx;
bevent->y = ty;
}
/* 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) {
/* 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)
tools_initialize (active_tool->type, gdisp);
}
/* Reset the current tool if we're changing drawables... */
} else
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);

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

@ -66,7 +66,7 @@ gint
gdisplay_canvas_events (GtkWidget *canvas,
GdkEvent *event)
{
GDisplay *gdisp;
GDisplay *gdisp, *tool_gdisp;
GdkEventExpose *eevent;
GdkEventMotion *mevent;
GdkEventButton *bevent;
@ -153,14 +153,19 @@ gdisplay_canvas_events (GtkWidget *canvas,
bevent->x = tx;
bevent->y = ty;
}
/* 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) {
/* 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)
tools_initialize (active_tool->type, gdisp);
}
/* Reset the current tool if we're changing drawables... */
} else
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);