From 0ee8b1706dc90b23e30eee8a5d9d2cd4c7c1f538 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 18 May 2021 22:16:40 +0200 Subject: [PATCH] Fix event_inside_widget_window() This fixes cases where a widget's parent isn't the top-level window and additional offset has to be taken into account. So far this has not been an issue since this method was only used for floating text entries. --- libs/gtkmm2ext/utils.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 87a97c77c9..6de3015c3c 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -1032,15 +1032,14 @@ Gtkmm2ext::event_inside_widget_window (Gtk::Widget& widget, GdkEvent* ev) return false; } - gint wx; - gint wy; - gint width, height, depth; gint x, y; + gint wx, wy; + gint width, height, depth; Glib::RefPtr widget_window = widget.get_window(); widget_window->get_geometry (x, y, width, height, depth); - widget_window->get_root_origin (wx, wy); + widget_window->get_origin (wx, wy); if ((evx >= wx && evx < wx + width) && (evy >= wy && evy < wy + height)) {