SF.net SVN: geany:[4733] trunk

[eht16 at users.sourceforge.net]

Revision: 4733
          http://geany.svn.sourceforge.net/geany/?rev=4733&view=rev
Author:   eht16
Date:     2010-03-07 17:44:14 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Focus the editor widget after hiding the sidebar when it had the input focus (patch by Can Koy, thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-07 17:37:00 UTC (rev 4732)
+++ trunk/ChangeLog	2010-03-07 17:44:14 UTC (rev 4733)
@@ -27,6 +27,9 @@
    When editing non-existent config files using the Tools->Configuration
    Files menu, explicitly set the real_path to avoid presenting the Save
    As dialog when saving the file (patch by Tony Rick, thanks).
+ * src/callbacks.c:
+   Focus the editor widget after hiding the sidebar when it had the
+   input focus (patch by Can Koy, thanks).
 
 
 2010-03-05  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2010-03-07 17:37:00 UTC (rev 4732)
+++ trunk/src/callbacks.c	2010-03-07 17:44:14 UTC (rev 4733)
@@ -1662,6 +1662,13 @@
 		interface_prefs.sidebar_symbol_visible = TRUE;
 	}
 
+#if GTK_CHECK_VERSION(2, 14, 0)
+	/* if window has input focus, set it back to the editor before toggling off */
+	if (ui_prefs.sidebar_visible == FALSE &&
+		gtk_container_get_focus_child(GTK_CONTAINER(main_widgets.sidebar_notebook)) != NULL)
+		keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR);
+#endif
+
 	ui_sidebar_show_hide();
 }
 


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