SF.net SVN: geany: [1843] trunk

[ntrel at users.sourceforge.net]

Revision: 1843
          http://geany.svn.sourceforge.net/geany/?rev=1843&view=rev
Author:   ntrel
Date:     2007-08-30 07:24:26 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Only focus the current document after switching pages if the open
files treeview currently has focus (otherwise focus commands can be
overridden, e.g. when pressing F4 during opening several files).

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-30 14:07:49 UTC (rev 1842)
+++ trunk/ChangeLog	2007-08-30 14:24:26 UTC (rev 1843)
@@ -9,6 +9,10 @@
    Rename non-menu keybinding titles, e.g. Tags menu -> Tags commands.
  * src/keybindings.c:
    Fix Ctrl-Shift bindings not working when caps lock is on.
+ * src/treeviews.c:
+   Only focus the current document after switching pages if the open
+   files treeview currently has focus (otherwise focus commands can be
+   overridden, e.g. when pressing F4 during opening several files).
 
 
 2007-08-29  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2007-08-30 14:07:49 UTC (rev 1842)
+++ trunk/src/treeviews.c	2007-08-30 14:24:26 UTC (rev 1843)
@@ -469,9 +469,11 @@
 	// idx might not be valid e.g. if user closed a tab whilst Geany is opening files
 	if (DOC_IDX_VALID(idx))
 	{
-		GtkWidget *widget = GTK_WIDGET(doc_list[idx].sci);
+		GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(app->window));
+		GtkWidget *sci = GTK_WIDGET(doc_list[idx].sci);
 
-		gtk_widget_grab_focus(widget);
+		if (focusw == tv.tree_openfiles)
+			gtk_widget_grab_focus(sci);
 	}
 	return FALSE;
 }


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