SF.net SVN: geany: [1279] branches/geany-0.10.1/scintilla/ScintillaGTK.cxx

[ntrel at users.sourceforge.net]

Revision: 1279
          http://svn.sourceforge.net/geany/?rev=1279&view=rev
Author:   ntrel
Date:     2007-02-14 04:50:15 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Redraw instead of scrolling in ScintillaGTK::ScrollText if there is
an existing update region.
Revert earlier ScintillaGTK::ExposeTextThis change.

Modified Paths:
--------------
    branches/geany-0.10.1/scintilla/ScintillaGTK.cxx

Modified: branches/geany-0.10.1/scintilla/ScintillaGTK.cxx
===================================================================
--- branches/geany-0.10.1/scintilla/ScintillaGTK.cxx	2007-02-14 12:42:28 UTC (rev 1278)
+++ branches/geany-0.10.1/scintilla/ScintillaGTK.cxx	2007-02-14 12:50:15 UTC (rev 1279)
@@ -1116,6 +1116,11 @@
 
 	gdk_gc_unref(gc);
 #else
+	// check if e.g. an existing scroll event has occurred
+	if (rgnUpdate != NULL) {
+		Redraw();
+		return;
+	}
 	gdk_window_scroll(wi->window, 0, -diff);
 	gdk_window_process_updates(wi->window, FALSE);
 #endif
@@ -2183,13 +2188,7 @@
 	rcPaint.right = ose->area.x + ose->area.width;
 	rcPaint.bottom = ose->area.y + ose->area.height;
 
-	/* We can receive an expose-event during an expose-event.
-	 * This can happen when two different scroll messages are sent at different times. */
-	if (rgnUpdate != NULL)
-	{
-		gdk_region_destroy(rgnUpdate);
-		rgnUpdate = NULL;
-	}
+	PLATFORM_ASSERT(rgnUpdate == NULL);
 #if GTK_MAJOR_VERSION >= 2
 	rgnUpdate = gdk_region_copy(ose->region);
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.