SF.net SVN: geany:[4323] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Thu Oct 15 17:55:30 UTC 2009
Revision: 4323
http://geany.svn.sourceforge.net/geany/?rev=4323&view=rev
Author: ntrel
Date: 2009-10-15 17:55:30 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Call editor_apply_update_prefs() from editor_create_widget() so
correct tab width and other settings are applied for Split Window
plugin.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/splitwindow.c
trunk/src/document.c
trunk/src/editor.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-15 16:54:15 UTC (rev 4322)
+++ trunk/ChangeLog 2009-10-15 17:55:30 UTC (rev 4323)
@@ -19,6 +19,10 @@
filetypes.common settings get set too.
Make highlighting_set_styles() take GeanyFiletype pointer instead of
filetype id.
+ * src/document.c, src/editor.c, plugins/splitwindow.c:
+ Call editor_apply_update_prefs() from editor_create_widget() so
+ correct tab width and other settings are applied for Split Window
+ plugin.
2009-10-14 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/plugins/splitwindow.c
===================================================================
--- trunk/plugins/splitwindow.c 2009-10-15 16:54:15 UTC (rev 4322)
+++ trunk/plugins/splitwindow.c 2009-10-15 17:55:30 UTC (rev 4323)
@@ -87,14 +87,15 @@
/* line numbers visibility */
-static void set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width)
+static void set_line_numbers(ScintillaObject * sci, gboolean set)
{
if (set)
{
gchar tmp_str[15];
gint len = scintilla_send_message(sci, SCI_GETLINECOUNT, 0, 0);
gint width;
- g_snprintf(tmp_str, 15, "_%d%d", len, extra_width);
+
+ g_snprintf(tmp_str, 15, "_%d", len);
width = scintilla_send_message(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, (sptr_t) tmp_str);
scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 0, width);
scintilla_send_message(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */
@@ -109,16 +110,20 @@
static void sync_to_current(ScintillaObject *sci, ScintillaObject *current)
{
gpointer sdoc;
+ gint pos;
/* set the new sci widget to view the existing Scintilla document */
sdoc = (gpointer) scintilla_send_message(current, SCI_GETDOCPOINTER, 0, 0);
scintilla_send_message(sci, SCI_SETDOCPOINTER, 0, (sptr_t) sdoc);
highlighting_set_styles(sci, edit_window.editor->document->file_type);
+ pos = sci_get_current_position(current);
+ sci_set_current_position(sci, pos, TRUE);
/* override some defaults */
- set_line_numbers(sci, TRUE, 0);
- scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */
+ set_line_numbers(sci, geany->editor_prefs->show_linenumber_margin);
+ scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin (no commands) */
+ scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 2, 0 ); /* hide fold margin (no toggle callback) */
}
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2009-10-15 16:54:15 UTC (rev 4322)
+++ trunk/src/document.c 2009-10-15 17:55:30 UTC (rev 4323)
@@ -569,8 +569,6 @@
doc->editor = editor_create(doc);
- editor_apply_update_prefs(doc->editor);
-
sidebar_openfiles_add(doc); /* sets doc->iter */
notebook_new_tab(doc);
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2009-10-15 16:54:15 UTC (rev 4322)
+++ trunk/src/editor.c 2009-10-15 17:55:30 UTC (rev 4323)
@@ -4693,6 +4693,7 @@
editor_set_indent_type(editor, iprefs->type);
editor_set_font(editor, interface_prefs.editor_font);
+ editor_apply_update_prefs(editor);
/* if editor already had a widget, restore it */
if (old)
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