tweak event/leave event delivery so that it applies to items being deleted as well as motion events (hmm, needed for item addition too ...)

2 files changed, 41 insertions, 12 deletions

diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index 3c3980890e..9707f2304d 100644
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -310,9 +310,36 @@ GtkCanvas::motion_notify_handler (GdkEventMotion* ev)
 		return _grabbed_item->Event (reinterpret_cast<GdkEvent*> (ev));
 	}
 
-	/* This is in canvas coordinates */
 	Duple point (ev->x, ev->y);
+	
+	enter_leave_items (point);
+
+	/* Now deliver the motion event.  It may seem a little inefficient
+	   to recompute the items under the event, but the enter notify/leave
+	   events may have deleted canvas items so it is important to
+	   recompute the list in deliver_event.
+	*/
+	return deliver_event (point, reinterpret_cast<GdkEvent*> (ev));
+}
+
+void
+GtkCanvas::enter_leave_items ()
+{
+	int x;
+	int y;
+	     
+	Glib::RefPtr<const Gdk::Window> pointer_window = Gdk::Display::get_default()->get_window_at_pointer (x, y);
+
+	if (pointer_window != get_window()) {
+		return;
+	}
 
+	enter_leave_items (window_to_canvas (Duple (x, y)));
+}
+		
+void
+GtkCanvas::enter_leave_items (Duple const & point)
+{
 	/* find the items at the new mouse position */
 	vector<Item const *> items;
 	_root.add_items_at_point (point, items);
@@ -323,8 +350,8 @@ GtkCanvas::motion_notify_handler (GdkEventMotion* ev)
 		/* leave event */
 		GdkEventCrossing leave_event;
 		leave_event.type = GDK_LEAVE_NOTIFY;
-		leave_event.x = ev->x;
-		leave_event.y = ev->y;
+		leave_event.x = point.x;
+		leave_event.y = point.y;
 		_current_item->Event (reinterpret_cast<GdkEvent*> (&leave_event));
 	}
 
@@ -332,19 +359,12 @@ GtkCanvas::motion_notify_handler (GdkEventMotion* ev)
 		/* enter event */
 		GdkEventCrossing enter_event;
 		enter_event.type = GDK_ENTER_NOTIFY;
-		enter_event.x = ev->x;
-		enter_event.y = ev->y;
+		enter_event.x = point.x;
+		enter_event.y = point.y;
 		new_item->Event (reinterpret_cast<GdkEvent*> (&enter_event));
 	}
 
 	_current_item = new_item;
-
-	/* Now deliver the motion event.  It may seem a little inefficient
-	   to recompute the items under the event, but the enter notify/leave
-	   events may have deleted canvas items so it is important to
-	   recompute the list in deliver_event.
-	*/
-	return deliver_event (point, reinterpret_cast<GdkEvent*> (ev));
 }
 
 /** Deliver an event to the appropriate item; either the grabbed item, or
@@ -428,6 +448,9 @@ GtkCanvas::item_going_away (Item* item, boost::optional<Rect> bounding_box)
 	if (_grabbed_item == item) {
 		_grabbed_item = 0;
 	}
+
+	enter_leave_items ();
+	
 }
 
 /** Handler for GDK expose events.
diff --git a/libs/canvas/canvas/canvas.h b/libs/canvas/canvas/canvas.h
index 8b8ed37cd4..09c04519e8 100644
--- a/libs/canvas/canvas/canvas.h
+++ b/libs/canvas/canvas/canvas.h
@@ -122,6 +122,9 @@ protected:
 
         Coord _scroll_offset_x;
         Coord _scroll_offset_y;
+
+        virtual void enter_leave_items () = 0;
+        virtual void enter_leave_items (Duple const &) = 0;
 };
 
 /** A canvas which renders onto a GTK EventBox */
@@ -149,6 +152,9 @@ protected:
 	bool motion_notify_handler (GdkEventMotion *);
 	bool deliver_event (Duple, GdkEvent *);
 
+        void enter_leave_items ();
+        void enter_leave_items (Duple const &);
+
 private:
 	void item_going_away (Item *, boost::optional<Rect>);
 	bool send_leave_event (Item const *, double, double) const;