don't wait for graphics expose events. Commented out the call to

2003-02-21  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell-scroll.c (gimp_display_shell_scroll):
	don't wait for graphics expose events. Commented out the call to
	gimp_display_shell_scale_setup() since it should not be needed.
This commit is contained in:
Sven Neumann 2003-02-21 13:07:15 +00:00 committed by Sven Neumann
parent 1b0339ad34
commit 3d91e359b1
2 changed files with 14 additions and 23 deletions

View File

@ -1,3 +1,9 @@
2003-02-21 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-scroll.c (gimp_display_shell_scroll):
don't wait for graphics expose events. Commented out the call to
gimp_display_shell_scale_setup() since it should not be needed.
2003-02-21 Sven Neumann <sven@gimp.org> 2003-02-21 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-render.c (render_image_rgb): * app/display/gimpdisplayshell-render.c (render_image_rgb):

View File

@ -42,8 +42,8 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
gint x_offset, gint x_offset,
gint y_offset) gint y_offset)
{ {
gint old_x, old_y; gint old_x;
GdkEvent *event; gint old_y;
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE); g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
@ -61,9 +61,11 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
if (x_offset || y_offset) if (x_offset || y_offset)
{ {
/* FIXME: I'm sure this is useless if all other places are correct --mitch /* The call to gimp_display_shell_scale_setup() shouldn't be needed
*/ here if all other places are correct.
gimp_display_shell_scale_setup (shell); gimp_display_shell_scale_setup (shell);
*/
/* reset the old values so that the tool can accurately redraw */ /* reset the old values so that the tool can accurately redraw */
shell->offset_x = old_x; shell->offset_x = old_x;
@ -81,24 +83,7 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
tool_manager_control_active (shell->gdisp->gimage->gimp, RESUME, tool_manager_control_active (shell->gdisp->gimage->gimp, RESUME,
shell->gdisp); shell->gdisp);
/* Make sure graphics expose events are processed before scrolling /* Make sure expose events are processed before scrolling again */
* again
*/
while ((event = gdk_event_get_graphics_expose (shell->canvas->window)))
{
gdk_window_invalidate_rect (shell->canvas->window,
&event->expose.area,
FALSE);
if (event->expose.count == 0)
{
gdk_event_free (event);
break;
}
gdk_event_free (event);
}
gdk_window_process_updates (shell->canvas->window, FALSE); gdk_window_process_updates (shell->canvas->window, FALSE);
gimp_display_shell_scrolled (shell); gimp_display_shell_scrolled (shell);