[balsa/popover: 47/67] libbalsa: When popping up, first check event
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/popover: 47/67] libbalsa: When popping up, first check event
- Date: Sun, 19 Jul 2020 16:45:44 +0000 (UTC)
commit d60511403877084ff9212064b9d9ac07496d4e42
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sun Jun 21 17:32:36 2020 -0400
libbalsa: When popping up, first check event
Return immediately if event does not trigger context menu.
libbalsa/libbalsa.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index 3d883e90f..548a83486 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -806,13 +806,15 @@ libbalsa_popup_widget_popup(GtkWidget *popup_widget,
g_return_if_fail(GTK_IS_POPOVER(popup_widget) || GTK_IS_MENU(popup_widget));
g_return_if_fail(widget == NULL || GTK_IS_WIDGET(widget));
+ if (event != NULL && !gdk_event_triggers_context_menu(event))
+ return;
+
if (libbalsa_use_popover()) {
GtkPopover *popover = GTK_POPOVER(popup_widget);
gdouble x, y;
GdkRectangle rectangle;
if (event != NULL &&
- gdk_event_triggers_context_menu(event) &&
gdk_event_get_coords(event, &x, &y)) {
if (GTK_IS_TREE_VIEW(widget)) {
gtk_tree_view_convert_bin_window_to_widget_coords(GTK_TREE_VIEW(widget),
@@ -850,7 +852,7 @@ libbalsa_popup_widget_popup(GtkWidget *popup_widget,
} else {
GtkMenu *menu = GTK_MENU(popup_widget);
- if (event != NULL && gdk_event_triggers_context_menu(event)) {
+ if (event != NULL) {
gtk_menu_popup_at_pointer(menu, event);
} else {
gtk_menu_popup_at_widget(menu, widget,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]