SF.net SVN: geany: [1691] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Wed Jul 11 17:05:13 UTC 2007


Revision: 1691
          http://svn.sourceforge.net/geany/?rev=1691&view=rev
Author:   eht16
Date:     2007-07-11 10:05:13 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
Experimental change of scrolling to get horizontal scrolling working.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-11 16:08:03 UTC (rev 1690)
+++ trunk/ChangeLog	2007-07-11 17:05:13 UTC (rev 1691)
@@ -4,6 +4,8 @@
    src/Makefile.am, tagmanager/Makefile.am:
    Apply patch from Shiv to make build system more compatible with other
    compilers than gcc.
+ * src/document.c, src/editor.c, src/sciwrappers.c, src/sciwrappers.h:
+   Experimental change of scrolling to get horizontal scrolling working.
 
 
 2007-07-11  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2007-07-11 16:08:03 UTC (rev 1690)
+++ trunk/src/document.c	2007-07-11 17:05:13 UTC (rev 1691)
@@ -315,6 +315,8 @@
 	sci_set_line_numbers(sci, app->show_linenumber_margin, 0);
 	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);
 
 	// 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-11 16:08:03 UTC (rev 1690)
+++ trunk/src/editor.c	2007-07-11 17:05:13 UTC (rev 1691)
@@ -2275,12 +2275,14 @@
 	// 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); // ensure visible (maybe not needed now)
 }
 
 

Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c	2007-07-11 16:08:03 UTC (rev 1690)
+++ trunk/src/sciwrappers.c	2007-07-11 17:05:13 UTC (rev 1691)
@@ -951,3 +951,13 @@
 	return SSM(sci, SCI_GETLINEINDENTATION, line, 0);
 }
 
+void sci_set_caret_policy_x(ScintillaObject *sci, gint policy, gint slop)
+{
+	SSM(sci, SCI_SETXCARETPOLICY, policy, slop);
+}
+
+void sci_set_caret_policy_y(ScintillaObject *sci, gint policy, gint slop)
+{
+	SSM(sci, SCI_SETYCARETPOLICY, policy, slop);
+}
+

Modified: trunk/src/sciwrappers.h
===================================================================
--- trunk/src/sciwrappers.h	2007-07-11 16:08:03 UTC (rev 1690)
+++ trunk/src/sciwrappers.h	2007-07-11 17:05:13 UTC (rev 1691)
@@ -177,5 +177,7 @@
 void				sci_set_use_tabs			(ScintillaObject * sci, gboolean set);
 
 void				sci_set_scrollbar_mode		(ScintillaObject * sci, gboolean visible);
+void				sci_set_caret_policy_x		(ScintillaObject * sci, gint policy, gint slop);
+void				sci_set_caret_policy_y		(ScintillaObject * sci, gint policy, gint slop);
 
 #endif


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



More information about the Commits mailing list