gproject: Fix opening already opened files from the sidebar

Also always focus the editor window when changing a file.
geany · Oct 4, 2014 · aef37b0 · aef37b0
1 parent 81cd2a2
commit aef37b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/gproject/src/gproject-sidebar.c b/gproject/src/gproject-sidebar.c
@@ -378,8 +378,11 @@ static void on_open_clicked(void)
 static gboolean on_button_press(G_GNUC_UNUSED GtkWidget * widget, GdkEventButton * event,
 		G_GNUC_UNUSED gpointer user_data)
 {
-	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) 
+	{
 		on_open_clicked();
+		return TRUE;
+	}
 
 	return FALSE;
 }
@@ -391,7 +394,10 @@ static gboolean on_key_press(G_GNUC_UNUSED GtkWidget * widget, GdkEventKey * eve
 	    || event->keyval == GDK_ISO_Enter
 	    || event->keyval == GDK_KP_Enter
 	    || event->keyval == GDK_space)
+	{
 		on_open_clicked();
+		return TRUE;
+	}
 	return FALSE;
 }
 
@@ -719,6 +725,7 @@ static gboolean on_button_release(G_GNUC_UNUSED GtkWidget * widget, GdkEventButt
 
 		gtk_menu_popup(GTK_MENU(s_popup_menu.widget), NULL, NULL, NULL, NULL,
 						event->button, event->time);
+		return TRUE;
 	}
 
 	return FALSE;

diff --git a/gproject/src/gproject-utils.c b/gproject/src/gproject-utils.c
@@ -138,19 +138,10 @@ void open_file(gchar *utf8_name)
 	doc = document_find_by_filename(utf8_name);
 
 	if (!doc)
-	{
 		document_open_file(name, FALSE, NULL, NULL);
-	}
 	else
-	{
-		GtkNotebook *notebook;
-		gint page_num;
-
-		notebook = GTK_NOTEBOOK(geany->main_widgets->notebook);
-		page_num = gtk_notebook_page_num(notebook, GTK_WIDGET(doc->editor->sci));
-
-		gtk_notebook_set_current_page(notebook, page_num);
-	}
+		document_show_tab(doc);
+	document_grab_focus(doc);
 
 	g_free(name);
 }