Revision: 5104
http://geany.svn.sourceforge.net/geany/?rev=5104&view=rev
Author: ntrel
Date: 2010-07-12 17:09:57 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
Focus toolbar item when pressing Go to Line keybinding only when
it's not in the toolbar's drop down overflow menu (fixes #3027454).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/keybindings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-07-11 03:20:25 UTC (rev 5103)
+++ trunk/ChangeLog 2010-07-12 17:09:57 UTC (rev 5104)
@@ -1,3 +1,10 @@
+2010-07-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c:
+ Focus toolbar item when pressing Go to Line keybinding only when
+ it's not in the toolbar's drop down overflow menu (fixes #3027454).
+
+
2010-07-11 Lex Trotman <elextr(at)gmail(dot)com>
* src/build.c:
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2010-07-11 03:20:25 UTC (rev 5103)
+++ trunk/src/keybindings.c 2010-07-12 17:09:57 UTC (rev 5104)
@@ -2003,8 +2003,8 @@
{
GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry");
- /* use toolbar item if shown */
- if (wid)
+ /* use toolbar item if shown & not in the drop down overflow menu */
+ if (wid && GTK_WIDGET_MAPPED(wid))
{
gtk_widget_grab_focus(wid);
return TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5100
http://geany.svn.sourceforge.net/geany/?rev=5100&view=rev
Author: ntrel
Date: 2010-07-09 15:14:55 +0000 (Fri, 09 Jul 2010)
Log Message:
-----------
Add note to restart Geany after installing/updating before editing
hidden prefs.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-07-09 15:13:14 UTC (rev 5099)
+++ trunk/ChangeLog 2010-07-09 15:14:55 UTC (rev 5100)
@@ -4,6 +4,9 @@
Fix scrolling the editor line in view after loading a session and
switching document tabs. Note this causes repainting so needs
improvement.
+ * doc/geany.txt, doc/geany.html:
+ Add note to restart Geany after installing/updating before editing
+ hidden prefs.
2010-07-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2010-07-09 15:13:14 UTC (rev 5099)
+++ trunk/doc/geany.html 2010-07-09 15:14:55 UTC (rev 5100)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="2010-07-06" />
+<meta name="date" content="2010-07-08" />
<style type="text/css">
/*
@@ -139,7 +139,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2010-07-06</td></tr>
+<td>2010-07-08</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.20</td></tr>
</tbody>
@@ -4648,6 +4648,12 @@
restarting Geany. Search for the key name, then edit the value. Example:</p>
<blockquote>
<tt class="docutils literal"><span class="pre">brace_match_ltgt=true</span></tt></blockquote>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you just installed or updated Geany, you should restart it
+first so Geany can write/update the config file and you can find
+the key lines.</p>
+</div>
<p>The table below show the key names of hidden preferences in the
configuration file.</p>
<table border="1" class="docutils">
@@ -6137,7 +6143,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-07-08 11:31 UTC.
+Generated on: 2010-07-09 12:18 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 2010-07-09 15:13:14 UTC (rev 5099)
+++ trunk/doc/geany.txt 2010-07-09 15:14:55 UTC (rev 5100)
@@ -4026,6 +4026,11 @@
``brace_match_ltgt=true``
+.. note::
+ If you just installed or updated Geany, you should restart it
+ first so Geany can write/update the config file and you can find
+ the key lines.
+
The table below show the key names of hidden preferences in the
configuration file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5099
http://geany.svn.sourceforge.net/geany/?rev=5099&view=rev
Author: ntrel
Date: 2010-07-09 15:13:14 +0000 (Fri, 09 Jul 2010)
Log Message:
-----------
Add note about using Stash to make implementing preferences easier.
Modified Paths:
--------------
trunk/doc/pluginsymbols.c
Modified: trunk/doc/pluginsymbols.c
===================================================================
--- trunk/doc/pluginsymbols.c 2010-07-09 12:12:23 UTC (rev 5098)
+++ trunk/doc/pluginsymbols.c 2010-07-09 15:13:14 UTC (rev 5099)
@@ -83,6 +83,7 @@
* connect the @c "response" signal. If settings should be read from the dialog, the
* reponse will be either @c GTK_RESPONSE_OK or @c GTK_RESPONSE_APPLY.
* @return A container widget holding preference widgets.
+ * @note Using @link stash.h Stash @endlink can make implementing preferences easier.
* @see plugin_configure_single(). */
GtkWidget *plugin_configure(GtkDialog *dialog);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5098
http://geany.svn.sourceforge.net/geany/?rev=5098&view=rev
Author: ntrel
Date: 2010-07-09 12:12:23 +0000 (Fri, 09 Jul 2010)
Log Message:
-----------
Fix scrolling the editor line in view after loading a session and
switching document tabs. Note this causes repainting so needs
improvement.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/editor.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-07-08 16:59:11 UTC (rev 5097)
+++ trunk/ChangeLog 2010-07-09 12:12:23 UTC (rev 5098)
@@ -1,3 +1,11 @@
+2010-07-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+ Fix scrolling the editor line in view after loading a session and
+ switching document tabs. Note this causes repainting so needs
+ improvement.
+
+
2010-07-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/ui_utils.c, doc/geany.txt, doc/geany.html:
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2010-07-08 16:59:11 UTC (rev 5097)
+++ trunk/src/editor.c 2010-07-09 12:12:23 UTC (rev 5098)
@@ -394,16 +394,6 @@
ui_update_statusbar(editor->document, pos);
- /* Visible lines are only laid out accurately once [SCN_UPDATEUI] is sent,
- * so we need to only call sci_scroll_to_line here, because the document
- * may have line wrapping and folding enabled.
- * http://scintilla.sourceforge.net/ScintillaDoc.html#LineWrapping */
- if (editor->scroll_percent > 0.0F)
- {
- editor_scroll_to_line(editor, -1, editor->scroll_percent);
- /* disable further scrolling */
- editor->scroll_percent = -1.0F;
- }
#if 0
/** experimental code for inverting selections */
{
@@ -911,6 +901,23 @@
on_update_ui(editor, nt);
break;
+ case SCN_PAINTED:
+ /* Visible lines are only laid out accurately just before painting,
+ * so we need to only call editor_scroll_to_line here, because the document
+ * may have line wrapping and folding enabled.
+ * http://scintilla.sourceforge.net/ScintillaDoc.html#LineWrapping
+ * This is important e.g. when loading a session and switching pages
+ * and having the cursor scroll in view. */
+ /* FIXME: Really we want to do this just before painting, not after it
+ * as it will cause repainting. */
+ if (editor->scroll_percent > 0.0F)
+ {
+ editor_scroll_to_line(editor, -1, editor->scroll_percent);
+ /* disable further scrolling */
+ editor->scroll_percent = -1.0F;
+ }
+ break;
+
case SCN_MODIFIED:
if (editor_prefs.show_linenumber_margin && (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) && nt->linesAdded)
{
@@ -4698,13 +4705,13 @@
}
-/* This is just to catch any uncolourised documents being drawn that didn't receive focus
- * for some reason, maybe it's not necessary but just in case. */
static gboolean on_editor_expose_event(GtkWidget *widget, GdkEventExpose *event,
gpointer user_data)
{
GeanyEditor *editor = user_data;
+ /* This is just to catch any uncolourised documents being drawn that didn't receive focus
+ * for some reason, maybe it's not necessary but just in case. */
editor_check_colourise(editor);
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.