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

If the current gdisp->ID does not match the ID of the gdisp_ptr in the 

Wed Apr 01 03:40:15 EST 1998 Matthew Wilson <msw@gimp.org>

	* app/disp_callbacks.c:  If the current gdisp->ID does not match
	the ID of the gdisp_ptr in the active_tool, restart it.

--Matt "I need sleep" Wilson
This commit is contained in:
EST 1998 Matthew Wilson 1998-04-01 08:44:33 +00:00 committed by Matt Wilson
parent beb9573a9b
commit 4553b3c845
4 changed files with 23 additions and 3 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 01 03:40:15 EST 1998 Matthew Wilson <msw@gimp.org>
* app/disp_callbacks.c: If the current gdisp->ID does not match
the ID of the gdisp_ptr in the active_tool, restart it.
Tue Mar 31 03:10:12 EST 1998 Matthew Wilson <msw@gimp.org> Tue Mar 31 03:10:12 EST 1998 Matthew Wilson <msw@gimp.org>
* app/iscissors.c: Set tool->preserve to TRUE in tools_new_iscissors. * app/iscissors.c: Set tool->preserve to TRUE in tools_new_iscissors.

7
app/disp_callbacks.c
View File

@ -66,7 +66,7 @@ gint
gdisplay_canvas_events (GtkWidget *canvas, gdisplay_canvas_events (GtkWidget *canvas,
GdkEvent *event) GdkEvent *event)
{ {
GDisplay *gdisp; GDisplay *gdisp, *tool_gdisp;
GdkEventExpose *eevent; GdkEventExpose *eevent;
GdkEventMotion *mevent; GdkEventMotion *mevent;
GdkEventButton *bevent; GdkEventButton *bevent;
@ -147,6 +147,11 @@ gdisplay_canvas_events (GtkWidget *canvas,
bevent->x = tx; bevent->x = tx;
bevent->y = ty; bevent->y = ty;
} }
/* Reset the current tool if we're changing displays... */
tool_gdisp = active_tool->gdisp_ptr;
if (tool_gdisp)
if (tool_gdisp->ID != gdisp->ID)
tools_select(active_tool->type);
(* active_tool->button_press_func) (active_tool, bevent, gdisp); (* active_tool->button_press_func) (active_tool, bevent, gdisp);
} }
break; break;

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

@ -66,7 +66,7 @@ gint
gdisplay_canvas_events (GtkWidget *canvas, gdisplay_canvas_events (GtkWidget *canvas,
GdkEvent *event) GdkEvent *event)
{ {
GDisplay *gdisp; GDisplay *gdisp, *tool_gdisp;
GdkEventExpose *eevent; GdkEventExpose *eevent;
GdkEventMotion *mevent; GdkEventMotion *mevent;
GdkEventButton *bevent; GdkEventButton *bevent;
@ -147,6 +147,11 @@ gdisplay_canvas_events (GtkWidget *canvas,
bevent->x = tx; bevent->x = tx;
bevent->y = ty; bevent->y = ty;
} }
/* Reset the current tool if we're changing displays... */
tool_gdisp = active_tool->gdisp_ptr;
if (tool_gdisp)
if (tool_gdisp->ID != gdisp->ID)
tools_select(active_tool->type);
(* active_tool->button_press_func) (active_tool, bevent, gdisp); (* active_tool->button_press_func) (active_tool, bevent, gdisp);
} }
break; break;

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

@ -66,7 +66,7 @@ gint
gdisplay_canvas_events (GtkWidget *canvas, gdisplay_canvas_events (GtkWidget *canvas,
GdkEvent *event) GdkEvent *event)
{ {
GDisplay *gdisp; GDisplay *gdisp, *tool_gdisp;
GdkEventExpose *eevent; GdkEventExpose *eevent;
GdkEventMotion *mevent; GdkEventMotion *mevent;
GdkEventButton *bevent; GdkEventButton *bevent;
@ -147,6 +147,11 @@ gdisplay_canvas_events (GtkWidget *canvas,
bevent->x = tx; bevent->x = tx;
bevent->y = ty; bevent->y = ty;
} }
/* Reset the current tool if we're changing displays... */
tool_gdisp = active_tool->gdisp_ptr;
if (tool_gdisp)
if (tool_gdisp->ID != gdisp->ID)
tools_select(active_tool->type);
(* active_tool->button_press_func) (active_tool, bevent, gdisp); (* active_tool->button_press_func) (active_tool, bevent, gdisp);
} }
break; break;