Merge from trunk:

2008-02-08  Richard Hult  <richard@imendio.com>

	Merge from trunk:

	* gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Ignore the
	delta from the NSEvent for now, generating multiple scroll events
	results in a lot of events getting queued up and things get really
	slow.

svn path=/branches/gtk-2-12/; revision=19500
This commit is contained in:
Richard Hult
2008-02-08 19:14:07 +00:00
committed by Richard Hult
parent f009c071be
commit aedbca9c4f
2 changed files with 15 additions and 0 deletions

View File

@@ -1,3 +1,12 @@
2008-02-08 Richard Hult <richard@imendio.com>
Merge from trunk:
* gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Ignore the
delta from the NSEvent for now, generating multiple scroll events
results in a lot of events getting queued up and things get really
slow.
2008-02-08 Sven Herzberg <sven@imendio.com>
Merge from trunk:

View File

@@ -1781,6 +1781,9 @@ gdk_event_translate (NSEvent *nsevent)
event = create_scroll_event (window, nsevent, direction);
append_event (event);
dy--;
/* Ignore the delta for now, things get too slow when the events queue up. */
break;
}
/* Now do x events */
@@ -1797,6 +1800,9 @@ gdk_event_translate (NSEvent *nsevent)
event = create_scroll_event (window, nsevent, direction);
append_event (event);
dx--;
/* Ignore the delta for now, things get too slow when the events queue up. */
break;
}
}