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

Fix using the current document on 'Close Other Documents' from the GtkNotebook tab menu

Browse Source 
Instead we should use that tab which is under mouse cursor where the user clicked (this might be a
different one than the current document). To be able to do so, we need to handle the right-click signal
per tab not on the GtkNotebook tab area to identify the tab under the mouse cursor.
This commit is contained in:
Enrico Tröger 2011-11-20 16:05:39 +01:00
parent 7aa9160b5f
commit cfa334de74
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/callbacks.c
View File

@ -1881,11 +1881,22 @@ void on_search1_activate(GtkMenuItem *menuitem, gpointer user_data)
}
/* simple implementation (vs. close all which doesn't close documents if cancelled) */
/* simple implementation (vs. close all which doesn't close documents if cancelled),
* if user_data is set, it is a GtkNotebook child widget */
void on_close_other_documents1_activate(GtkMenuItem *menuitem, gpointer user_data)
{
guint i;
GeanyDocument *doc, *cur_doc = document_get_current();
GeanyDocument *doc, *cur_doc;
if (user_data != NULL)
{
gint page_num = gtk_notebook_page_num(
GTK_NOTEBOOK(main_widgets.notebook), GTK_WIDGET(user_data));
cur_doc = document_get_from_page(page_num);
}
else
cur_doc = document_get_current();
for (i = 0; i < documents_array->len; i++)
{

27
src/notebook.c
View File

@ -207,11 +207,12 @@ static void on_open_in_new_window_activate(GtkMenuItem *menuitem, gpointer user_
}
static void show_tab_bar_popup_menu(GdkEventButton *event)
static void show_tab_bar_popup_menu(GdkEventButton *event, GtkWidget *page)
{
GtkWidget *menu_item;
static GtkWidget *menu = NULL;
GeanyDocument *doc = NULL;
gint page_num;
if (menu == NULL)
menu = gtk_menu_new();
@ -226,14 +227,19 @@ static void show_tab_bar_popup_menu(GdkEventButton *event)
gtk_widget_show(menu_item);
gtk_container_add(GTK_CONTAINER(menu), menu_item);
doc = document_get_current();
if (page != NULL)
{
page_num = gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), page);
doc = document_get_from_page(page_num);
}
menu_item = ui_image_menu_item_new(GTK_STOCK_OPEN, "Open in New _Window");
gtk_widget_show(menu_item);
gtk_container_add(GTK_CONTAINER(menu), menu_item);
g_signal_connect(menu_item, "activate",
G_CALLBACK(on_open_in_new_window_activate), doc);
/* disable if not on disk */
if (!doc->real_path)
if (doc == NULL || !doc->real_path)
gtk_widget_set_sensitive(menu_item, FALSE);
menu_item = gtk_separator_menu_item_new();
@ -243,7 +249,8 @@ static void show_tab_bar_popup_menu(GdkEventButton *event)
menu_item = ui_image_menu_item_new(GTK_STOCK_CLOSE, _("Close Ot_her Documents"));
gtk_widget_show(menu_item);
gtk_container_add(GTK_CONTAINER(menu), menu_item);
g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_other_documents1_activate), NULL);
g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_other_documents1_activate), page);
gtk_widget_set_sensitive(GTK_WIDGET(menu_item), (page != NULL));
menu_item = ui_image_menu_item_new(GTK_STOCK_CLOSE, _("C_lose All"));
gtk_widget_show(menu_item);
@ -270,9 +277,12 @@ static gboolean notebook_tab_bar_click_cb(GtkWidget *widget, GdkEventButton *eve
return TRUE;
}
}
/* right-click is also handled here if it happened on the notebook tab bar but not
* on a tab directly */
else if (event->button == 3)
{
show_tab_bar_popup_menu(event);
show_tab_bar_popup_menu(event, NULL);
return TRUE;
}
return FALSE;
}
@ -369,6 +379,13 @@ static gboolean notebook_tab_click(GtkWidget *widget, GdkEventButton *event, gpo
GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED);
return TRUE;
}
/* right-click is first handled here if it happened on a notebook tab */
if (event->button == 3)
{
show_tab_bar_popup_menu(event, data);
return TRUE;
}
return FALSE;
}