From e1d77cc771487e8ba17c3dba45a68df596854c1c Mon Sep 17 00:00:00 2001
From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
Date: Thu, 11 Dec 2025 17:22:30 +0100
Subject: [PATCH 1/2] Remove maxSnapFaces parameter from params.py

Removed 'maxSnapFaces' parameter from settings.
---
 src/Mod/Draft/draftutils/params.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Mod/Draft/draftutils/params.py b/src/Mod/Draft/draftutils/params.py
index 615d843752..72a36ce778 100644
--- a/src/Mod/Draft/draftutils/params.py
+++ b/src/Mod/Draft/draftutils/params.py
@@ -493,7 +493,6 @@ def _get_param_dictionary():
         "LayersManagerWidth":          ("int",       640),
         "MakeFaceMode":                ("bool",      True),
         "maxSnapEdges":                ("int",       0),
-        "maxSnapFaces":                ("int",       0),
         "OffsetCopyMode":              ("bool",      False),
         "Offset_OCC":                  ("bool",      False),
         "RelativeMode":                ("bool",      True),

From 4b379c8e51aa35a5817eb290515c4c679b399ef0 Mon Sep 17 00:00:00 2001
From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
Date: Thu, 11 Dec 2025 17:32:44 +0100
Subject: [PATCH 2/2] Draft: fix lag when snapping to face intersections

Fixes #25924.

The `snapToIntersection` function has been changed to an if-elif structure, and in case of face-edge intersection snap, only two sublements are checked. This ensures a reasonable speed, even if objects have many edges and faces. The change does mean you have to move the mouse over the correct face for it to be processed. But since face-edge intersection snap is new anyway, this is acceptable I think.
---
 src/Mod/Draft/draftguitools/gui_snapper.py | 41 ++++++++++++++++------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/Mod/Draft/draftguitools/gui_snapper.py b/src/Mod/Draft/draftguitools/gui_snapper.py
index 890c7d9b39..2ec3ae0567 100644
--- a/src/Mod/Draft/draftguitools/gui_snapper.py
+++ b/src/Mod/Draft/draftguitools/gui_snapper.py
@@ -91,6 +91,7 @@ class Snapper:
     def __init__(self):
         self.activeview = None
         self.lastObj = []
+        self.lastObjSubelements = []
         self.radius = 0
         self.constraintAxis = None
         self.basepoint = None
@@ -99,7 +100,6 @@ class Snapper:
         self.cursorMode = None
         self.cursorQt = None
         self.maxEdges = params.get_param("maxSnapEdges")
-        self.maxFaces = params.get_param("maxSnapFaces")
 
         # we still have no 3D view when the draft module initializes
         self.tracker = None
@@ -460,10 +460,13 @@ class Snapper:
         # objects must be added even if no snap has been found for the object
         # otherwise Intersection snap (for example) will not work
         if obj.Name in self.lastObj:
+            self.lastObjSubelements.pop(self.lastObj.index(obj.Name))
             self.lastObj.remove(obj.Name)
         self.lastObj.append(obj.Name)
+        self.lastObjSubelements.append(subname.split(".")[-1])
         if len(self.lastObj) > 8:
             self.lastObj = self.lastObj[-8:]
+            self.lastObjSubelements = self.lastObjSubelements[-8:]
 
         if not snaps:
             return None
@@ -1035,18 +1038,33 @@ class Snapper:
         snaps = []
         if self.isEnabled("Intersection"):
             # get the stored objects to calculate intersections
-            for obj_name in self.lastObj:
+            for obj_name, sub_name in zip(self.lastObj, self.lastObjSubelements):
                 obj = App.ActiveDocument.getObject(obj_name)
                 if obj and (obj.isDerivedFrom("Part::Feature") or (Draft.getType(obj) == "Axis")):
-                    if (not self.maxFaces) or (len(obj.Shape.Faces) <= self.maxFaces):
-                        for face in obj.Shape.Faces:
-                            try:
-                                pts = DraftGeomUtils.findIntersection(face, shape)
-                                for pt in pts:
-                                    snaps.append([pt, "intersection", self.toWP(pt)])
-                            except Exception:
-                                pass
-                    if (not self.maxEdges) or (len(obj.Shape.Edges) <= self.maxEdges):
+                    # obj sub is face, shape is edge:
+                    if "Face" in sub_name and shape.ShapeType == "Edge":
+                        face = obj.Shape.Faces[int(sub_name[4:]) - 1]
+                        try:
+                            pts = DraftGeomUtils.findIntersection(face, shape)
+                            for pt in pts:
+                                snaps.append([pt, "intersection", self.toWP(pt)])
+                        except Exception:
+                            pass
+                    elif "Edge" not in sub_name:
+                        pass
+                    # obj sub is edge, shape is face:
+                    elif shape.ShapeType == "Face":
+                        edge = obj.Shape.Edges[int(sub_name[4:]) - 1]
+                        try:
+                            pts = DraftGeomUtils.findIntersection(edge, shape)
+                            for pt in pts:
+                                snaps.append([pt, "intersection", self.toWP(pt)])
+                        except Exception:
+                            pass
+                    elif shape.ShapeType != "Edge":
+                        pass
+                    # obj sub is edge, shape is edge:
+                    elif (not self.maxEdges) or (len(obj.Shape.Edges) <= self.maxEdges):
                         for edge in obj.Shape.Edges:
                             try:
                                 if (
@@ -1247,6 +1265,7 @@ class Snapper:
         self.running = False
         self.holdPoints = []
         self.lastObj = []
+        self.lastObjSubelements = []
 
         if hasattr(App, "activeDraftCommand") and App.activeDraftCommand:
             return