[balsa/wip/gtk4: 82/351] Simplify making the over-url popup menu
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/wip/gtk4: 82/351] Simplify making the over-url popup menu
- Date: Wed, 23 May 2018 21:23:50 +0000 (UTC)
commit 1a6e00b9bba1051c14f390cbcdfef8bc4757c136
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sun Dec 3 15:47:43 2017 -0500
Simplify making the over-url popup menu
src/balsa-mime-widget-text.c | 38 ++------------------------------------
1 files changed, 2 insertions(+), 36 deletions(-)
---
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 6d7d7d4..06bd2f7 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -461,46 +461,11 @@ url_send_cb(GtkWidget * menu_item, message_url_t * uri)
static gboolean
text_view_url_popup(GtkWidget *widget, GtkMenu *menu)
{
- GList *url_list = g_object_get_data(G_OBJECT(widget), "url-list");
- GdkEvent *event;
- gboolean fetched = FALSE;
message_url_t *url;
- gint x, y;
GtkWidget *menu_item;
- /* no url list: no check... */
- if (!url_list)
- return FALSE;
-
/* check if we are over an url */
- event = gtk_get_current_event();
- if (event != NULL) {
- gdouble x_win;
- gdouble y_win;
-
- fetched = gdk_event_get_coords(event, &x_win, &y_win);
- if (fetched) {
- x = (gint) x_win;
- y = (gint) y_win;
- }
- gdk_event_free(event);
- }
-
- if (!fetched) {
- GdkWindow *window;
- GdkDisplay *display;
- GdkSeat *seat;
- GdkDevice *device;
-
- window = gtk_widget_get_window(widget);
- display = gdk_window_get_display(window);
- seat = gdk_display_get_default_seat(display);
- device = gdk_seat_get_pointer(seat);
- /* This seems to be off by a few pixels: */
- gdk_window_get_device_position(window, device, &x, &y, NULL);
- }
-
- url = find_url(widget, x, y, url_list);
+ url = g_object_get_data(G_OBJECT(widget), "current-url");
if (!url)
return FALSE;
@@ -636,6 +601,7 @@ check_over_url(GtkWidget * widget, GdkEvent * event,
}
current_url = url;
+ g_object_set_data(G_OBJECT(widget), "current-url", current_url);
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]