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

put back some important code that was accidentially removed when fixing 

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

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): put back some important
	code that was accidentially removed when fixing bug #162823. Also
	moved the calls to gtk_grab_add() and gtk_grab_remove() around a
	bit.
This commit is contained in:
Michael Natterer 2005-02-21 18:41:05 +00:00 committed by Michael Natterer
parent b83dff24d5
commit 39fd4b3984
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-02-21 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_canvas_tool_events): put back some important
code that was accidentially removed when fixing bug #162823. Also
moved the calls to gtk_grab_add() and gtk_grab_remove() around a
bit.
2005-02-21 Michael Natterer <mitch@gimp.org>
* app/widgets/gimptoolbox.c (toolbox_area_notify): apply evil

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

@ -775,23 +775,33 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
gdk_display_pointer_ungrab (gdk_display, time);
gtk_grab_add (GTK_WIDGET (canvas));
if (active_tool &&
(! gimp_image_is_empty (gimage) ||
gimp_tool_control_handles_empty_image (active_tool->control)))
{
if (gimp_tool_control_is_active (active_tool->control))
{
gtk_grab_add (GTK_WIDGET (canvas));
tool_manager_button_release_active (gimp,
&image_coords,
time, state,
gdisp);
gtk_grab_remove (GTK_WIDGET (canvas));
}
}
/* update the tool's modifier state because it didn't get
* key events while BUTTON1 was down
*/
tool_manager_focus_display_active (gimp, gdisp);
tool_manager_modifier_state_active (gimp, state, gdisp);
tool_manager_oper_update_active (gimp,
&image_coords, state,
gdisp);
gtk_grab_remove (GTK_WIDGET (canvas));
if (shell->space_release_pending)
{
#ifdef DEBUG_MOVE_PUSH