Remove code duplication (#3067)

Author: anlumo

internal/core/item_tree.rs

@@ -470,7 +470,7 @@ impl ItemRc {
     /// Returns an absolute position of `p` in the parent item coordinate system
     /// (does not add this item's x and y)
     pub fn map_to_window(&self, p: LogicalPoint) -> LogicalPoint {
-        self.map_to_item_tree_impl(p, None)
+        self.map_to_item_tree_impl(p, |_| None)
     }
 
     /// Returns an absolute position of `p` in the `ItemTree`'s coordinate system
@@ -480,53 +480,31 @@ impl ItemRc {
         p: LogicalPoint,
         item_tree: &vtable::VRc<ItemTreeVTable>,
     ) -> LogicalPoint {
-        self.map_to_item_tree_impl(p, Some(item_tree))
+        self.map_to_item_tree_impl(p, |current| current.is_root_item_of(item_tree))
+    }
+
+    /// Returns an absolute position of `p` in the `ancestor`'s coordinate system
+    /// (does not add this item's x and y)
+    /// Don't rely on any specific behavior if `self` isn't a descendant of `ancestor`.
+    fn map_to_ancestor(&self, p: LogicalPoint, ancestor: &Self) -> LogicalPoint {
+        self.map_to_item_tree_impl(p, |parent, _| parent == ancestor)
     }
 
     fn map_to_item_tree_impl(
         &self,
         p: LogicalPoint,
-        item_tree: Option<&vtable::VRc<ItemTreeVTable>>,
+        stop_condition: impl Fn(&ItemRc) -> bool,
     ) -> LogicalPoint {
         let mut current = self.clone();
         let mut result = p;
-        if item_tree.is_some_and(|item_tree| current.is_root_item_of(item_tree)) {
+        if stop_condition(&current) {
             return result;
         }
         let supports_transformations = self
             .window_adapter()
             .is_none_or(|adapter| adapter.renderer().supports_transformations());
         while let Some(parent) = current.parent_item(ParentItemTraversalMode::StopAtPopups) {
-            if item_tree.is_some_and(|item_tree| current.is_root_item_of(item_tree)) {
-                break;
-            }
-            let geometry = parent.geometry();
-            if supports_transformations {
-                if let Some(transform) = parent.children_transform() {
-                    result = transform.transform_point(result.cast()).cast();
-                }
-            }
-            result += geometry.origin.to_vector();
-            current = parent;
-        }
-        result
-    }
-
-    /// Returns an absolute position of `p` in the `ancestor`'s coordinate system
-    /// (does not add this item's x and y)
-    /// Don't rely on any specific behavior if `self` isn't a descendant of `ancestor`.
-    fn map_to_ancestor(&self, p: LogicalPoint, ancestor: &Self) -> LogicalPoint {
-        let mut current = self.clone();
-        let mut result = p;
-        if &current == ancestor {
-            return result;
-        }
-        let supports_transformations = self
-            .window_adapter()
-            .map(|adapter| adapter.renderer().supports_transformations())
-            .unwrap_or(true);
-        while let Some(parent) = current.parent_item(ParentItemTraversalMode::StopAtPopups) {
-            if &parent == ancestor {
+            if stop_condition(&parent) {
                 break;
             }
             let geometry = parent.geometry();