SF.net SVN: geany:[3363] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Thu Dec 11 17:18:07 UTC 2008
Revision: 3363
http://geany.svn.sourceforge.net/geany/?rev=3363&view=rev
Author: ntrel
Date: 2008-12-11 17:18:06 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
Make Shift+Mouse wheel scroll the editor view horizontally
(#2410732).
Add function sci_scroll_columns().
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/editor.c
trunk/src/sciwrappers.c
trunk/src/sciwrappers.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-11 16:56:28 UTC (rev 3362)
+++ trunk/ChangeLog 2008-12-11 17:18:06 UTC (rev 3363)
@@ -19,7 +19,13 @@
* src/interface.c, src/ui_utils.h, src/notebook.c, src/keyfile.c,
doc/geany.txt, doc/geany.html, geany.glade:
Add an interface pref for whether to hide additional widgets when
- double-clicking on document notebook tabs (off by default).
+ double-clicking on document notebook tabs (off by default) - closes
+ #2300430.
+ * src/sciwrappers.c, src/sciwrappers.h, src/editor.c, doc/geany.txt,
+ doc/geany.html:
+ Make Shift+Mouse wheel scroll the editor view horizontally
+ (#2410732).
+ Add function sci_scroll_columns().
2008-12-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2008-12-11 16:56:28 UTC (rev 3362)
+++ trunk/doc/geany.html 2008-12-11 17:18:06 UTC (rev 3363)
@@ -3863,6 +3863,7 @@
<ul class="simple">
<li>Alt-scroll wheel moves up/down a page.</li>
<li>Ctrl-scroll wheel zooms in/out.</li>
+<li>Shift-scroll wheel scrolls 8 characters right/left.</li>
<li>Ctrl-click on a word in a document to perform <em>Go to Tag Definition</em>.</li>
<li>Ctrl-click on a bracket/brace to perform <em>Go to Matching Brace</em>.</li>
</ul>
@@ -4529,7 +4530,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-12-11 16:25 UTC.
+Generated on: 2008-12-11 17:16 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2008-12-11 16:56:28 UTC (rev 3362)
+++ trunk/doc/geany.txt 2008-12-11 17:18:06 UTC (rev 3363)
@@ -3406,6 +3406,7 @@
* Alt-scroll wheel moves up/down a page.
* Ctrl-scroll wheel zooms in/out.
+* Shift-scroll wheel scrolls 8 characters right/left.
* Ctrl-click on a word in a document to perform *Go to Tag Definition*.
* Ctrl-click on a bracket/brace to perform *Go to Matching Brace*.
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-12-11 16:56:28 UTC (rev 3362)
+++ trunk/src/editor.c 2008-12-11 17:18:06 UTC (rev 3363)
@@ -3936,15 +3936,23 @@
static gboolean
on_editor_scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
{
+ GeanyEditor *editor = user_data;
+
/* Handle scroll events if Alt is pressed and scroll whole pages instead of a
* few lines only, maybe this could/should be done in Scintilla directly */
if (event->state & GDK_MOD1_MASK)
{
- GeanyEditor *editor = user_data;
sci_send_command(editor->sci, (event->direction == GDK_SCROLL_DOWN) ? SCI_PAGEDOWN : SCI_PAGEUP);
return TRUE;
}
+ else if (event->state & GDK_SHIFT_MASK)
+ {
+ gint amount = (event->direction == GDK_SCROLL_DOWN) ? 8 : -8;
+ sci_scroll_columns(editor->sci, amount);
+ return TRUE;
+ }
+
return FALSE; /* let Scintilla handle all other cases */
}
Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c 2008-12-11 16:56:28 UTC (rev 3362)
+++ trunk/src/sciwrappers.c 2008-12-11 17:18:06 UTC (rev 3363)
@@ -763,6 +763,12 @@
}
+void sci_scroll_columns(ScintillaObject *sci, gint columns)
+{
+ SSM(sci, SCI_LINESCROLL, columns, 0);
+}
+
+
gint sci_search_next(ScintillaObject *sci, gint flags, const gchar *text)
{
return SSM(sci, SCI_SEARCHNEXT, flags, (sptr_t) text );
Modified: trunk/src/sciwrappers.h
===================================================================
--- trunk/src/sciwrappers.h 2008-12-11 16:56:28 UTC (rev 3362)
+++ trunk/src/sciwrappers.h 2008-12-11 17:18:06 UTC (rev 3363)
@@ -125,6 +125,7 @@
void sci_set_anchor (ScintillaObject * sci, gint pos);
void sci_scroll_caret (ScintillaObject * sci);
void sci_scroll_lines (ScintillaObject * sci, gint lines);
+void sci_scroll_columns (ScintillaObject *sci, gint columns);
gint sci_search_next (ScintillaObject * sci, gint flags, const gchar *text);
gint sci_search_prev (ScintillaObject * sci, gint flags, const gchar *text);
gint sci_find_text (ScintillaObject * sci, gint flags, struct TextToFind *ttf);
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