SF.net SVN: geany: [2711] trunk

[eht16 at users.sourceforge.net]

Revision: 2711
          http://geany.svn.sourceforge.net/geany/?rev=2711&view=rev
Author:   eht16
Date:     2008-06-19 09:13:19 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Improve scrolling on wrapped lines to avoid having search results on wrapped lines but outside of visible lines.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-19 15:58:10 UTC (rev 2710)
+++ trunk/ChangeLog	2008-06-19 16:13:19 UTC (rev 2711)
@@ -11,6 +11,9 @@
    Replace Spaces by tabs.
    Refactor different document keybindings callback functions into
    cb_func_document_action().
+ * src/editor.c:
+   Improve scrolling on wrapped lines to avoid having search results on
+   wrapped lines but outside of visible lines.
 
 
 2008-06-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2008-06-19 15:58:10 UTC (rev 2710)
+++ trunk/src/editor.c	2008-06-19 16:13:19 UTC (rev 2711)
@@ -2891,6 +2891,11 @@
 {
 	gint vis1, los;
 
+	/* If line is wrapped the result may occur on another virtual line than the first and may be
+	 * still hidden, so increase the line number to check for the next document line */
+	if (SSM(sci, SCI_WRAPCOUNT, line, 0) > 1)
+		line++;
+
 	line = SSM(sci, SCI_VISIBLEFROMDOCLINE, line, 0);	/* convert to visible line number */
 	vis1 = SSM(sci, SCI_GETFIRSTVISIBLELINE, 0, 0);
 	los = SSM(sci, SCI_LINESONSCREEN, 0, 0);


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