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

if the canvas has no focus on button_press, set it explicitly instead of 

2003-08-16  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): if the canvas has no
	focus on button_press, set it explicitly instead of asuming that
	focus_in will follow anyway. Should once more fix bug #85202.

	Grab the keyboard while button1 is down so the focus can't go away
	while the tool can't receive modifier events. Should fix more
	#85202-alike bugs.
This commit is contained in:
Michael Natterer 2003-08-16 21:07:13 +00:00 committed by Michael Natterer
parent 790491e50f
commit a4823e99c7
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2003-08-16 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_canvas_tool_events): if the canvas has no
focus on button_press, set it explicitly instead of asuming that
focus_in will follow anyway. Should once more fix bug #85202.
Grab the keyboard while button1 is down so the focus can't go away
while the tool can't receive modifier events. Should fix more
#85202-alike bugs.
2003-08-16 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpwidgets.c (gimp_coordinates_callback): moved

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

@ -541,18 +541,26 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
bevent = (GdkEventButton *) event;
/* in "click to focus" mode, the BUTTON_PRESS arrives before
* FOCUS_IN, so we have to update the tool's modifier state here
*/
if (state && ! GTK_WIDGET_HAS_FOCUS (canvas))
if (! GTK_WIDGET_HAS_FOCUS (canvas))
{
gimp_display_shell_update_tool_modifiers (shell, 0, state);
/* in "click to focus" mode, the BUTTON_PRESS arrives before
* FOCUS_IN, so we have to update the tool's modifier state here
*/
if (state)
{
gimp_display_shell_update_tool_modifiers (shell, 0, state);
tool_manager_oper_update_active (gimp,
&image_coords, state,
gdisp);
tool_manager_oper_update_active (gimp,
&image_coords, state,
gdisp);
}
button_press_before_focus = TRUE;
/* we expect a FOCUS_IN event to follow, but can't rely
* on it, so force one
*/
gdk_window_focus (canvas->window, time);
}
/* ignore new mouse events */
@ -591,6 +599,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
NULL, NULL, time);
}
gdk_keyboard_grab (canvas->window, FALSE, time);
/* save the current modifier state because tools don't get
* key events while BUTTON1 is down
*/
@ -710,6 +720,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
}
}
gdk_keyboard_ungrab (time);
gdk_pointer_ungrab (time);
/* restore the tool's modifier state because it didn't get
@ -1225,6 +1236,8 @@ gimp_display_shell_hruler_button_press (GtkWidget *widget,
GDK_BUTTON_RELEASE_MASK,
NULL, NULL, event->time);
gdk_keyboard_grab (shell->canvas->window, FALSE, event->time);
gimp_move_tool_start_hguide (active_tool, gdisp);
}
}
@ -1269,6 +1282,8 @@ gimp_display_shell_vruler_button_press (GtkWidget *widget,
GDK_BUTTON_RELEASE_MASK,
NULL, NULL, event->time);
gdk_keyboard_grab (shell->canvas->window, FALSE, event->time);
gimp_move_tool_start_vguide (active_tool, gdisp);
}
}