HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable code folding in splitview window (closes #3097780)

Browse Source 
Based on a patch by Matthew Brush, thanks!

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5632 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling 2011-03-27 00:18:05 +00:00
parent 4c7ad1f113
commit fc910a2448
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -11,6 +11,9 @@
src/project.c:
Add possibility to detect the indentation width from the file content
(not supported if indentation type is tabs only).
* plugins/splitwindow.c:
Enable code folding in splitview window (based on a patch by Matthew
Brush, thanks! - closes #3097780).
2011-03-25 Colomban Wendling <colomban(at)geany(dot)org>

41
plugins/splitwindow.c
View File

@ -73,10 +73,11 @@ typedef struct EditWindow
ScintillaObject *sci; /* new editor widget */
GtkWidget *vbox;
GtkWidget *name_label;
gint handler_id;
}
EditWindow;
static EditWindow edit_window = {NULL, NULL, NULL, NULL};
static EditWindow edit_window = {NULL, NULL, NULL, NULL, 0 };
static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data);
@ -103,6 +104,25 @@ static void set_line_numbers(ScintillaObject * sci, gboolean set)
}
static void on_sci_notify (ScintillaObject *sci, gint param, SCNotification *notif, gpointer data)
{
gint line;
switch (notif->nmhdr.code)
{
case SCN_MARGINCLICK:
if (notif->margin == 2)
{
line = sci_get_line_from_position(sci, notif->position);
scintilla_send_message(sci, SCI_TOGGLEFOLD, line, 0);
}
break;
default: break;
}
}
static void sync_to_current(ScintillaObject *sci, ScintillaObject *current)
{
gpointer sdoc;
@ -119,7 +139,6 @@ static void sync_to_current(ScintillaObject *sci, ScintillaObject *current)
/* override some defaults */
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) */
}
@ -127,6 +146,12 @@ static void set_editor(EditWindow *editwin, GeanyEditor *editor)
{
editwin->editor = editor;
if (editwin->handler_id > 0 && editwin->sci != NULL)
{
g_signal_handler_disconnect(editwin->sci, editwin->handler_id);
editwin->handler_id = 0;
}
/* first destroy any widget, otherwise its signals will have an
* invalid document as user_data */
if (editwin->sci != NULL)
@ -138,6 +163,12 @@ static void set_editor(EditWindow *editwin, GeanyEditor *editor)
sync_to_current(editwin->sci, editor->sci);
if (geany->editor_prefs->folding)
editwin->handler_id = g_signal_connect(editwin->sci, "sci-notify",
G_CALLBACK(on_sci_notify), NULL);
else
scintilla_send_message(editwin->sci, SCI_SETMARGINWIDTHN, 2, 0);
gtk_label_set_text(GTK_LABEL(editwin->name_label), DOC_FILENAME(editor->document));
}
@ -332,6 +363,12 @@ static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data)
gtk_widget_reparent(notebook,
ui_lookup_widget(geany->main_widgets->window, "vbox1"));
if (edit_window.sci != NULL && edit_window.handler_id > 0)
{
g_signal_handler_disconnect(edit_window.sci, edit_window.handler_id);
edit_window.handler_id = 0;
}
gtk_widget_destroy(pane);
edit_window.editor = NULL;
edit_window.sci = NULL;