SF.net SVN: geany: [1696] trunk

[eht16 at users.sourceforge.net]

Revision: 1696
          http://svn.sourceforge.net/geany/?rev=1696&view=rev
Author:   eht16
Date:     2007-07-12 10:16:44 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
Use again the usual, previous way of line scrolling and use SCI_SETXCARETPOLICY for horizontal scrolling.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-12 15:44:13 UTC (rev 1695)
+++ trunk/ChangeLog	2007-07-12 17:16:44 UTC (rev 1696)
@@ -1,3 +1,10 @@
+2007-07-12  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/document.c, src/editor.c:
+   Use again the usual, previous way of line scrolling and use
+   SCI_SETXCARETPOLICY for horizontal scrolling.
+
+
 2007-07-12  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/prefs.c:

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2007-07-12 15:44:13 UTC (rev 1695)
+++ trunk/src/document.c	2007-07-12 17:16:44 UTC (rev 1696)
@@ -318,7 +318,7 @@
 	sci_set_lines_wrapped(sci, editor_prefs.line_breaking);
 	sci_set_scrollbar_mode(sci, editor_prefs.show_scrollbars);
 	sci_set_caret_policy_x(sci, CARET_JUMPS | CARET_EVEN, 0);
-	sci_set_caret_policy_y(sci, CARET_JUMPS | CARET_EVEN, 0);
+	//sci_set_caret_policy_y(sci, CARET_JUMPS | CARET_EVEN, 0);
 
 	// signal for insert-key(works without too, but to update the right status bar)
 	//g_signal_connect((GtkWidget*) sci, "key-press-event",

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2007-07-12 15:44:13 UTC (rev 1695)
+++ trunk/src/editor.c	2007-07-12 17:16:44 UTC (rev 1696)
@@ -2275,14 +2275,12 @@
 	// sci 'visible line' != doc line number because of folding and line wrapping
 	/* calling SCI_VISIBLEFROMDOCLINE for line is more accurate than calling
 	 * SCI_DOCLINEFROMVISIBLE for vis1. */
-/*
 	line = SSM(sci, SCI_VISIBLEFROMDOCLINE, line, 0);
 	vis1 = SSM(sci, SCI_GETFIRSTVISIBLELINE, 0, 0);
 	los = SSM(sci, SCI_LINESONSCREEN, 0, 0);
 	delta = (line - vis1) - los * percent_of_view;
 	sci_scroll_lines(sci, delta);
-*/
-	sci_scroll_caret(sci); // ensure visible (maybe not needed now)
+	sci_scroll_caret(sci); // needed for horizontal scrolling
 }
 
 


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