Ticket #4343: 0003-CellRendererIcon-more-improvement-in-point_in_cell_r.patch

src/sugar3/graphics/icon.py

@@ -761 +761 @@
         self._prelit_stroke_color = None
         self._active_state = False
         self._palette_invoker = CellRendererInvoker()
+        self._x = None
+        self._width = None
 
         Gtk.CellRenderer.__init__(self)
 
@@ -887 +889 @@
         if x is None and y is None:
             x, y = tree_view.get_pointer()
             x, y = tree_view.convert_widget_to_bin_window_coords(x, y)
+
+        # Horizontal filter.
+        if self._x is not None:
+            if x < self._x or x > self._x + self._width:
+                return False
+
         pos = tree_view.get_path_at_pos(int(x), int(y))
         if pos is None:
             return False
 
-        path_, column, x, y_ = pos
+        path, column, x, y_ = pos
         result = column.cell_get_position(self)
 
         # If this cell was not found in the column:
@@ -899 +907 @@
             return False
 
         cell_x, cell_width = result
+
+        # Cache the absolute x and width of this cell if not done yet.
+        if self._x is None:
+            column_area = tree_view.get_cell_area(path, column)
+            self._x = column_area.x + cell_x
+            self._width = cell_width
+
         for cell_renderer in column.get_cells():
             if cell_renderer == self:
                 if x > cell_x and x < (cell_x + cell_width):